mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-31 12:53:41 +01:00
Merge branch 'master' into api11
# Conflicts: # Dalamud/Game/ClientState/Fates/Fate.cs # Dalamud/Game/Gui/NamePlate/NamePlateUpdateContext.cs # Dalamud/Interface/Internal/DalamudInterface.cs # Dalamud/Interface/Windowing/Window.cs # Dalamud/Utility/StringExtensions.cs # lib/FFXIVClientStructs
This commit is contained in:
commit
720b1676e5
49 changed files with 4573 additions and 93 deletions
|
|
@ -71,7 +71,7 @@ public interface IFate : IEquatable<IFate>
|
|||
/// <summary>
|
||||
/// Gets a value indicating whether or not this <see cref="Fate"/> has a EXP bonus.
|
||||
/// </summary>
|
||||
[Obsolete("Use HasBonus instead")]
|
||||
[Obsolete($"Use {nameof(HasBonus)} instead")]
|
||||
bool HasExpBonus { get; }
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -222,7 +222,7 @@ internal unsafe partial class Fate : IFate
|
|||
public byte Progress => this.Struct->Progress;
|
||||
|
||||
/// <inheritdoc/>
|
||||
[Obsolete("Use HasBonus instead")]
|
||||
[Obsolete($"Use {nameof(HasBonus)} instead")]
|
||||
public bool HasExpBonus => this.Struct->IsExpBonus;
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue