From 5c5b15810baec6b97f1bf3989b8ae6201f8a70b4 Mon Sep 17 00:00:00 2001 From: MidoriKami <9083275+MidoriKami@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:55:53 -0800 Subject: [PATCH 1/6] Fix IconButton Caravan Issue --- Dalamud/Interface/Components/ImGuiComponents.IconButton.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs index 7ef3f56e5..cee5c5390 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs @@ -55,7 +55,7 @@ public static partial class ImGuiComponents /// The color of the button when hovered. /// Indicator if button is clicked. public static bool IconButton(int id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null) - => IconButton($"{icon.ToIconString()}{id}", defaultColor, activeColor, hoveredColor); + => IconButton($"{icon.ToIconString()}##{id}", defaultColor, activeColor, hoveredColor); /// /// IconButton component to use an icon as a button with color options. From 9beea2186460b5fe5797d3d2f4f8d774f4259acf Mon Sep 17 00:00:00 2001 From: MidoriKami <9083275+MidoriKami@users.noreply.github.com> Date: Thu, 12 Jan 2023 14:56:21 -0800 Subject: [PATCH 2/6] Add IconButton overloads --- .../Components/ImGuiComponents.IconButton.cs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs index cee5c5390..99e43d68c 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs @@ -26,6 +26,15 @@ public static partial class ImGuiComponents public static bool IconButton(int id, FontAwesomeIcon icon) => IconButton(id, icon, null, null, null); + /// + /// IconButton component to use an icon as a button. + /// + /// The ID of the button. + /// The icon for the button. + /// Indicator if button is clicked. + public static bool IconButton(string id, FontAwesomeIcon icon) + => IconButton(id, icon, null, null, null); + /// /// IconButton component to use an icon as a button. /// @@ -57,6 +66,18 @@ public static partial class ImGuiComponents public static bool IconButton(int id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null) => IconButton($"{icon.ToIconString()}##{id}", defaultColor, activeColor, hoveredColor); + /// + /// IconButton component to use an icon as a button with color options. + /// + /// The ID of the button. + /// The icon for the button. + /// The default color of the button. + /// The color of the button when active. + /// The color of the button when hovered. + /// Indicator if button is clicked. + public static bool IconButton(string id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null) + => IconButton($"{icon.ToIconString()}##{id}", defaultColor, activeColor, hoveredColor); + /// /// IconButton component to use an icon as a button with color options. /// From ee09c83051fa578c7a1021582ed90fc4d72c1b9a Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sat, 14 Jan 2023 12:21:47 +1030 Subject: [PATCH 3/6] Update FFXIVClientStructs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 2d1e16c14..af4c2b5f9 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 2d1e16c148b429081894e3c7fb0761e67ced0ac2 +Subproject commit af4c2b5f9aebfb2518da9fe167fe8fdfdf614b38 From 6a9c23573fd0d79af27a71c6ee264fca04000026 Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 14 Jan 2023 14:30:07 +0100 Subject: [PATCH 4/6] build: 7.4.0.0 --- Dalamud/Dalamud.csproj | 2 +- Dalamud/Interface/Internal/Windows/ChangelogWindow.cs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index 6d802f540..d0c6fdd22 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -8,7 +8,7 @@ - 7.3.5.0 + 7.4.0.0 XIV Launcher addon framework $(DalamudVersion) $(DalamudVersion) diff --git a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs index ea1f7cd95..05854210e 100644 --- a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs @@ -18,12 +18,11 @@ internal sealed class ChangelogWindow : Window, IDisposable /// /// Whether the latest update warrants a changelog window. /// - public const string WarrantsChangelogForMajorMinor = "7.0."; + public const string WarrantsChangelogForMajorMinor = "7.4."; private const string ChangeLog = - @"• Updated Dalamud for compatibility with Patch 6.2 -• Made things more speedy -• Plugins can now be toggled off while remaining installed, instead of being removed completely + @"• Updated Dalamud for compatibility with Patch 6.3 +• Made things more speedy by updating to .NET 7 If you note any issues or need help, please check the FAQ, and reach out on our Discord if you need help. Thanks and have fun!"; From 8df665551e8f415b0c1cc7571c7b9b32474ad23d Mon Sep 17 00:00:00 2001 From: Aireil <33433913+Aireil@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:00:34 +0100 Subject: [PATCH 5/6] fix: do not decommission if repo has not loaded properly --- Dalamud/Plugin/Internal/Types/LocalPlugin.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs index d01cc17e7..9d36a1644 100644 --- a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs +++ b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs @@ -225,6 +225,7 @@ internal class LocalPlugin : IDisposable /// Gets a value indicating whether or not this plugin is serviced(repo still exists, but plugin no longer does). /// public bool IsDecommissioned => !this.IsDev && + this.GetSourceRepository()?.State == PluginRepositoryState.Success && this.GetSourceRepository()?.PluginMaster?.FirstOrDefault(x => x.InternalName == this.Manifest.InternalName) == null; /// From dae1b637975e77e88c19227112cbf8d344ef15b1 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:07:22 +0100 Subject: [PATCH 6/6] build: 7.4.1.0 --- Dalamud/Dalamud.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index d0c6fdd22..fd837896a 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -8,7 +8,7 @@ - 7.4.0.0 + 7.4.1.0 XIV Launcher addon framework $(DalamudVersion) $(DalamudVersion)