ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 13:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into apiX-rollup

Browse source
This commit is contained in:
github-actions[bot] 2024-05-07 14:50:55 +00:00
commit fa95caec38
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
View file

@ -44,4 +44,9 @@ public enum DutyCategory
/// The adventuring forays category. /// The adventuring forays category.
/// </summary> /// </summary>
AdventuringForays = 1 << 6, AdventuringForays = 1 << 6,
/// <summary>
/// The variant and criterion dungeons category.
/// </summary>
VariantAndCriterionDungeons = 1 << 7,
} }

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 25e7b3e283ea12a4127acd8aced87de72239e16d Subproject commit b7a834e78fd7250023c3f70c5717c28b01d18acc