From 0d20ff25e431ee53b52becd0057b513aea46e4a2 Mon Sep 17 00:00:00 2001
From: Haselnussbomber <mail@haselnussbomber.de>
Date: Sat, 5 Aug 2023 13:11:24 +0200
Subject: [PATCH 1/4] fix: missing ## for id in DisabledButton

---
 Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs b/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs
index 181bbbfd7..907ad0aeb 100644
--- a/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs
+++ b/Dalamud/Interface/Components/ImGuiComponents.DisabledButton.cs
@@ -25,7 +25,7 @@ public static partial class ImGuiComponents
 
         var text = icon.ToIconString();
         if (id.HasValue)
-            text = $"{text}{id}";
+            text = $"{text}##{id}";
 
         var button = DisabledButton(text, defaultColor, activeColor, hoveredColor, alphaMult);
 

From cd3d23e0fd6f1a477d245d86f7ccb82aa9db0530 Mon Sep 17 00:00:00 2001
From: bleatbot <106497096+bleatbot@users.noreply.github.com>
Date: Tue, 8 Aug 2023 16:16:41 +0200
Subject: [PATCH 2/4] Update ClientStructs (#1339)

Co-authored-by: github-actions[bot] <noreply@github.com>
---
 lib/FFXIVClientStructs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 782d73171..155511a61 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 782d7317176f232d7108b2b3a4cb75de67fc3a8a
+Subproject commit 155511a61559c529719d3810eaf8fb9336482878

From b4c24305f23140194dc198355ec6e6060515ade6 Mon Sep 17 00:00:00 2001
From: goat <goatsdev@protonmail.com>
Date: Tue, 8 Aug 2023 18:42:23 +0200
Subject: [PATCH 3/4] chore: add pre-filled FTUE level to config, so that
 existing users will not get a FTUE once we add it

---
 Dalamud/Configuration/Internal/DalamudConfiguration.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Dalamud/Configuration/Internal/DalamudConfiguration.cs b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
index 39c53c3cb..ac410527c 100644
--- a/Dalamud/Configuration/Internal/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
@@ -69,6 +69,12 @@ internal sealed class DalamudConfiguration : IServiceType
     /// </summary>
     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>
     /// Gets or sets the last loaded Dalamud version.
     /// </summary>

From 426e7f53efe999a05ec8a5211ef725a4357151da Mon Sep 17 00:00:00 2001
From: goat <goatsdev@protonmail.com>
Date: Tue, 8 Aug 2023 18:42:52 +0200
Subject: [PATCH 4/4] build: 7.10.0.0

---
 Dalamud/Dalamud.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index 12068a35c..494c0f297 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup Label="Feature">
-        <DalamudVersion>7.9.0.0</DalamudVersion>
+        <DalamudVersion>7.10.0.0</DalamudVersion>
         <Description>XIV Launcher addon framework</Description>
         <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
         <Version>$(DalamudVersion)</Version>