Merge branch 'master' into flytext-fixes2

Dalamud/Dalamud.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup Label="Feature">
-        <DalamudVersion>7.3.5.0</DalamudVersion>
+        <DalamudVersion>7.4.1.0</DalamudVersion>
         <Description>XIV Launcher addon framework</Description>
         <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
         <Version>$(DalamudVersion)</Version>

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);
 
+    /// <summary>
+    /// IconButton component to use an icon as a button.
+    /// </summary>
+    /// <param name="id">The ID of the button.</param>
+    /// <param name="icon">The icon for the button.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(string id, FontAwesomeIcon icon)
+        => IconButton(id, icon, null, null, null);
+
     /// <summary>
     /// IconButton component to use an icon as a button.
     /// </summary>
@@ -55,7 +64,19 @@ public static partial class ImGuiComponents
     /// <param name="hoveredColor">The color of the button when hovered.</param>
     /// <returns>Indicator if button is clicked.</returns>
     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);
+
+    /// <summary>
+    /// IconButton component to use an icon as a button with color options.
+    /// </summary>
+    /// <param name="id">The ID of the button.</param>
+    /// <param name="icon">The icon for the button.</param>
+    /// <param name="defaultColor">The default color of the button.</param>
+    /// <param name="activeColor">The color of the button when active.</param>
+    /// <param name="hoveredColor">The color of the button when hovered.</param>
+    /// <returns>Indicator if button is clicked.</returns>
+    public static bool IconButton(string id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null)
+        => IconButton($"{icon.ToIconString()}##{id}", defaultColor, activeColor, hoveredColor);
 
     /// <summary>
     /// IconButton component to use an icon as a button with color options.

Dalamud/Interface/Internal/Windows/ChangelogWindow.cs

@@ -18,12 +18,11 @@ internal sealed class ChangelogWindow : Window, IDisposable
     /// <summary>
     /// Whether the latest update warrants a changelog window.
     /// </summary>
-    public const string WarrantsChangelogForMajorMinor = "7.0.";
+    public const string WarrantsChangelogForMajorMinor = "7.4.";
 
     private const string ChangeLog =
-        @"• Updated Dalamud for compatibility with Patch 6.2
+        @"• Updated Dalamud for compatibility with Patch 6.3
-• Made things more speedy
+• Made things more speedy by updating to .NET 7
-• Plugins can now be toggled off while remaining installed, instead of being removed completely
 
 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!";

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).
     /// </summary>
     public bool IsDecommissioned => !this.IsDev &&
+                                    this.GetSourceRepository()?.State == PluginRepositoryState.Success &&
                                     this.GetSourceRepository()?.PluginMaster?.FirstOrDefault(x => x.InternalName == this.Manifest.InternalName) == null;
 
     /// <summary>