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

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

Browse source
This commit is contained in:
github-actions[bot] 2023-08-08 16:43:32 +00:00
commit 4fb3c4728b
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Configuration/Internal/DalamudConfiguration.cs
View file

@ -69,6 +69,12 @@ internal sealed class DalamudConfiguration : IServiceType
/// </summary> /// </summary>
public string LastVersion { get; set; } = null; public string LastVersion { get; set; } = null;
/// <summary>
/// Gets or sets a value indicating the last seen FTUE version.
/// Unused for now, added to prevent existing users from seeing level 0 FTUE.
/// </summary>
public int SeenFtueLevel { get; set; } = 1;
/// <summary> /// <summary>
/// Gets or sets the last loaded Dalamud version. /// Gets or sets the last loaded Dalamud version.
/// </summary> /// </summary>

2
Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs
View file

@ -25,7 +25,7 @@ public static partial class ImGuiComponents
var text = icon.ToIconString(); var text = icon.ToIconString();
if (id.HasValue) if (id.HasValue)
text = $"{text}{id}"; text = $"{text}##{id}";
var button = DisabledButton(text, defaultColor, activeColor, hoveredColor, alphaMult); var button = DisabledButton(text, defaultColor, activeColor, hoveredColor, alphaMult);

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 782d7317176f232d7108b2b3a4cb75de67fc3a8a Subproject commit 155511a61559c529719d3810eaf8fb9336482878