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

Merge branch 'net5' of github.com:goatcorp/Dalamud into net5

Browse source
This commit is contained in:
goat 2022-07-09 03:15:09 +02:00
commit f653aab237
No known key found for this signature in database
GPG key ID: 7773BB5B43BA52E5
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
View file

@ -11,16 +11,22 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// <summary> /// <summary>
/// No duty condition. /// No duty condition.
/// </summary> /// </summary>
None = 1, None = 1 << 0,
/// <summary> /// <summary>
/// The duty complete condition. /// The duty complete condition.
/// </summary> /// </summary>
DutyComplete = 2, DutyComplete = 1 << 1,
/// <summary>
/// The duty complete (weekly reward unclaimed) condition. This condition is
/// only available for savage fights prior to echo release.
/// </summary>
DutyCompleteWeeklyRewardUnclaimed = 1 << 3,
/// <summary> /// <summary>
/// The duty incomplete condition. /// The duty incomplete condition.
/// </summary> /// </summary>
DutyIncomplete = 4, DutyIncomplete = 1 << 2,
} }
} }

1
Dalamud/Game/Internal/AntiDebug.cs
View file

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Dalamud.Configuration.Internal;
using Serilog; using Serilog;
namespace Dalamud.Game.Internal namespace Dalamud.Game.Internal