From dc57952536f5771626b7e8e024c49fcc184f47b6 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Tue, 21 Jan 2025 09:42:12 -0800
Subject: [PATCH 1/5] Merge pull request #966 from ionite34/fixes-n-stuff

Fixes n stuff

(cherry picked from commit fb81ebbb0fea4d15272366ce1a119ef77d35b446)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                                  | 55 ++++++++++++
 .../Languages/Resources.Designer.cs           |  4 +-
 .../Languages/Resources.resx                  |  4 +-
 .../ViewModels/CheckpointsPageViewModel.cs    | 29 +++++--
 StabilityMatrix.Core/Helper/SharedFolders.cs  |  6 ++
 .../Models/Packages/A3WebUI.cs                |  2 +-
 .../Models/Packages/ComfyZluda.cs             |  5 ++
 .../Models/Packages/InvokeAI.cs               | 85 +++++++------------
 .../Packages/StableDiffusionDirectMl.cs       |  2 +-
 StabilityMatrix.Core/Python/PipInstallArgs.cs |  5 ++
 10 files changed, 129 insertions(+), 68 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c5ead4c..0d0e4a52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,61 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.14.0-dev.2
+### Added
+- Added Align Your Steps scheduler to Inference
+### Changed
+- Updated the Civitai Model Browser base model selector to match the new Checkpoint Manager filter UI 
+- FaceDetailers in Inference will now inherit the primary sampler/scheduler/etc. by default. You can still manually set these by enabling the options via the ⚙️ button on the FaceDetailer card
+- Slightly rearranged the FaceDetailer card layout due to the above change
+- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
+### Fixed
+- Fixed crash when dragging & dropping images in Inference (hopefully)
+- Fixed HiresFix Inference addon not inheriting sampler/scheduler properly
+- Fixed some plus (+) buttons getting cut off in the Inference UI
+- Fixed CFG Rescale addon interfering with refiner model in Inference
+- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
+- Fixed issue when parsing index URLs in Python Dependencies Override menu
+- Fixed ComfyUI-Zluda not respecting pip user overrides
+- Fixed issue with Checkpoint Manager not displaying any models
+### Supporters
+#### Visionaries
+- A huge thank you to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your generous support is greatly appreciated!
+
+## v2.14.0-dev.1
+### Added
+- Added Rescale CFG addon to Inference
+- Added Swap Dimensions button between the width/height input in Inference
+- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
+- Added OpenModelDB tab to the Model Browser
+### Changed
+- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
+- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
+- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
+- Improved image metadata parsing - thanks to @Genteure!
+### Fixed
+- Fixed Inference image selector card buttons taking up the whole height of the card
+- Fixed Inference mask editor failing to paint to the right-most edge on large images
+- Fixed Inference mask editor not showing the entire image in certain circumstances
+- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
+- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
+- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
+### Supporters
+#### Visionaries
+- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
+
+## v2.13.3
+### Changed
+- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
+### Fixed
+- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
+- Fixed issue when parsing index URLs in Python Dependencies Override menu
+
+>>>>>>> fb81ebbb (Merge pull request #966 from ionite34/fixes-n-stuff)
 ## v2.13.2
 ### Changed
 - Removed SimpleSDXL due to security concerns - thanks to @iwr-redmond for the detailed report. For more information please visit https://github.com/LykosAI/StabilityMatrix/security/advisories.
diff --git a/StabilityMatrix.Avalonia/Languages/Resources.Designer.cs b/StabilityMatrix.Avalonia/Languages/Resources.Designer.cs
index 4b1fcef9..06f8c803 100644
--- a/StabilityMatrix.Avalonia/Languages/Resources.Designer.cs
+++ b/StabilityMatrix.Avalonia/Languages/Resources.Designer.cs
@@ -2640,7 +2640,7 @@ public static string Label_ReleasesUnavailableForThisPackage {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Remove shared checkpoints directory symbolic links on shutdown.
+        ///   Looks up a localized string similar to Remove shared folder symbolic links on shutdown.
         /// </summary>
         public static string Label_RemoveSymlinksOnShutdown {
             get {
@@ -2649,7 +2649,7 @@ public static string Label_RemoveSymlinksOnShutdown {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select this option if you&apos;re having problems moving Stability Matrix to another drive.
+        ///   Looks up a localized string similar to Removes both model and output folder symbolic links when closing Stability Matrix. Select this option if you&apos;re having problems moving Stability Matrix to another drive.
         /// </summary>
         public static string Label_RemoveSymlinksOnShutdown_Details {
             get {
diff --git a/StabilityMatrix.Avalonia/Languages/Resources.resx b/StabilityMatrix.Avalonia/Languages/Resources.resx
index 12ccc82f..9a17d0c9 100644
--- a/StabilityMatrix.Avalonia/Languages/Resources.resx
+++ b/StabilityMatrix.Avalonia/Languages/Resources.resx
@@ -418,10 +418,10 @@
     <value>Checkpoint Manager</value>
   </data>
   <data name="Label_RemoveSymlinksOnShutdown" xml:space="preserve">
-    <value>Remove shared checkpoints directory symbolic links on shutdown</value>
+    <value>Remove shared folder symbolic links on shutdown</value>
   </data>
   <data name="Label_RemoveSymlinksOnShutdown_Details" xml:space="preserve">
-    <value>Select this option if you&apos;re having problems moving Stability Matrix to another drive</value>
+    <value>Removes both model and output folder symbolic links when closing Stability Matrix. Select this option if you're having problems moving Stability Matrix to another drive</value>
   </data>
   <data name="Label_ResetCheckpointsCache" xml:space="preserve">
     <value>Reset Checkpoints Cache</value>
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
index 057d5ba8..af0e59cd 100644
--- a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
@@ -1041,8 +1041,9 @@ private bool FilterModels(LocalModelFile file)
     {
         if (SelectedCategory?.Path is null || SelectedCategory?.Path == settingsManager.ModelsDirectory)
             return file.HasConnectedModel
-                ? SelectedBaseModels.Contains(file.ConnectedModelInfo.BaseModel ?? "Other")
-                : SelectedBaseModels.Contains("Other");
+                ? SelectedBaseModels.Count == 0
+                    || SelectedBaseModels.Contains(file.ConnectedModelInfo.BaseModel ?? "Other")
+                : SelectedBaseModels.Count == 0 || SelectedBaseModels.Contains("Other");
 
         var folderPath = Path.GetDirectoryName(file.RelativePath);
         var categoryRelativePath = SelectedCategory
@@ -1056,16 +1057,30 @@ private bool FilterModels(LocalModelFile file)
         if (
             (
                 file.HasConnectedModel
-                    ? SelectedBaseModels.Contains(file.ConnectedModelInfo?.BaseModel ?? "Other")
-                    : SelectedBaseModels.Contains("Other")
+                    ? SelectedBaseModels.Count == 0
+                        || SelectedBaseModels.Contains(file.ConnectedModelInfo?.BaseModel ?? "Other")
+                    : SelectedBaseModels.Count == 0 || SelectedBaseModels.Contains("Other")
             )
             is false
         )
             return false;
 
-        return ShowModelsInSubfolders
-            ? folderPath.StartsWith(categoryRelativePath)
-            : categoryRelativePath.Equals(folderPath);
+        // If not showing nested models, just check if the file is directly in this folder
+        if (!ShowModelsInSubfolders)
+            return categoryRelativePath.Equals(folderPath, StringComparison.OrdinalIgnoreCase);
+
+        // Split paths into segments
+        var categorySegments = categoryRelativePath.Split(Path.DirectorySeparatorChar);
+        var folderSegments = folderPath.Split(Path.DirectorySeparatorChar);
+
+        // Check if folder is a subfolder of category by comparing path segments
+        if (folderSegments.Length < categorySegments.Length)
+            return false;
+
+        // Compare each segment of the category path with the folder path
+        return !categorySegments
+            .Where((t, i) => !t.Equals(folderSegments[i], StringComparison.OrdinalIgnoreCase))
+            .Any();
     }
 
     private bool FilterCategories(CheckpointCategory category)
diff --git a/StabilityMatrix.Core/Helper/SharedFolders.cs b/StabilityMatrix.Core/Helper/SharedFolders.cs
index 72826285..d0c5e067 100644
--- a/StabilityMatrix.Core/Helper/SharedFolders.cs
+++ b/StabilityMatrix.Core/Helper/SharedFolders.cs
@@ -195,6 +195,12 @@ public void RemoveLinksForAllPackages()
                     .RemoveModelFolderLinks(package.FullPath, sharedFolderMethod)
                     .GetAwaiter()
                     .GetResult();
+
+                // Remove output folder links if enabled
+                if (package.UseSharedOutputFolder)
+                {
+                    basePackage.RemoveOutputFolderLinks(package.FullPath).GetAwaiter().GetResult();
+                }
             }
             catch (Exception e)
             {
diff --git a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs
index f971fe0d..a6a302e8 100644
--- a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs
+++ b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs
@@ -39,7 +39,7 @@ IPrerequisiteHelper prerequisiteHelper
         new("https://github.com/AUTOMATIC1111/stable-diffusion-webui/raw/master/screenshot.png");
     public string RelativeArgsDefinitionScriptPath => "modules.cmd_args";
 
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Recommended;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
 
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
 
diff --git a/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs b/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs
index da22c610..4f395566 100644
--- a/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs
+++ b/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs
@@ -71,6 +71,11 @@ await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false),
 
         pipArgs = pipArgs.AddArg("numpy==1.26.0");
 
+        if (installedPackage.PipOverrides != null)
+        {
+            pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
+        }
+
         progress?.Report(
             new ProgressReport(-1f, "Installing Package Requirements...", isIndeterminate: true)
         );
diff --git a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
index 90cd6637..51ca659e 100644
--- a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
+++ b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
@@ -22,7 +22,7 @@ public class InvokeAI : BaseGitPackage
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
     private const string RelativeRootPath = "invokeai-root";
-    private string RelativeFrontendBuildPath = Path.Combine("invokeai", "frontend", "web", "dist");
+    private readonly string relativeFrontendBuildPath = Path.Combine("invokeai", "frontend", "web", "dist");
 
     public override string Name => "InvokeAI";
     public override string DisplayName { get; set; } = "InvokeAI";
@@ -35,7 +35,7 @@ public class InvokeAI : BaseGitPackage
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Nightmare;
 
     public override IReadOnlyList<string> ExtraLaunchCommands =>
-        new[] { "invokeai-db-maintenance", "invokeai-import-images", };
+        ["invokeai-db-maintenance", "invokeai-import-images"];
 
     public override Uri PreviewImageUri =>
         new("https://raw.githubusercontent.com/invoke-ai/InvokeAI/main/docs/assets/canvas_preview.png");
@@ -57,80 +57,50 @@ IPrerequisiteHelper prerequisiteHelper
     public override Dictionary<SharedFolderType, IReadOnlyList<string>> SharedFolders =>
         new()
         {
-            [SharedFolderType.StableDiffusion] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "main")
-            },
-            [SharedFolderType.Lora] = new[] { Path.Combine(RelativeRootPath, "autoimport", "lora") },
-            [SharedFolderType.TextualInversion] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "embedding")
-            },
-            [SharedFolderType.ControlNet] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "controlnet")
-            },
-            [SharedFolderType.InvokeIpAdapters15] = new[]
-            {
+            [SharedFolderType.StableDiffusion] = [Path.Combine(RelativeRootPath, "autoimport", "main")],
+            [SharedFolderType.Lora] = [Path.Combine(RelativeRootPath, "autoimport", "lora")],
+            [SharedFolderType.TextualInversion] = [Path.Combine(RelativeRootPath, "autoimport", "embedding")],
+            [SharedFolderType.ControlNet] = [Path.Combine(RelativeRootPath, "autoimport", "controlnet")],
+            [SharedFolderType.InvokeIpAdapters15] =
+            [
                 Path.Combine(RelativeRootPath, "models", "sd-1", "ip_adapter")
-            },
-            [SharedFolderType.InvokeIpAdaptersXl] = new[]
-            {
+            ],
+            [SharedFolderType.InvokeIpAdaptersXl] =
+            [
                 Path.Combine(RelativeRootPath, "models", "sdxl", "ip_adapter")
-            },
-            [SharedFolderType.InvokeClipVision] = new[]
-            {
+            ],
+            [SharedFolderType.InvokeClipVision] =
+            [
                 Path.Combine(RelativeRootPath, "models", "any", "clip_vision")
-            },
-            [SharedFolderType.T2IAdapter] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "t2i_adapter")
-            }
+            ],
+            [SharedFolderType.T2IAdapter] = [Path.Combine(RelativeRootPath, "autoimport", "t2i_adapter")]
         };
 
     public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
-        new() { [SharedOutputType.Text2Img] = new[] { Path.Combine("invokeai-root", "outputs", "images") } };
+        new() { [SharedOutputType.Text2Img] = [Path.Combine("invokeai-root", "outputs", "images")] };
 
     public override string OutputFolderName => Path.Combine("invokeai-root", "outputs", "images");
 
     // https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CONFIGURATION.md
     public override List<LaunchOptionDefinition> LaunchOptions =>
         [
-            new LaunchOptionDefinition
-            {
-                Name = "Host",
-                Type = LaunchOptionType.String,
-                DefaultValue = "localhost",
-                Options = ["--host"]
-            },
-            new LaunchOptionDefinition
+            new()
             {
-                Name = "Port",
+                Name = "Root Directory",
                 Type = LaunchOptionType.String,
-                DefaultValue = "9090",
-                Options = ["--port"]
+                Options = ["--root"]
             },
-            new LaunchOptionDefinition
+            new()
             {
-                Name = "Allow Origins",
-                Description =
-                    "List of host names or IP addresses that are allowed to connect to the "
-                    + "InvokeAI API in the format ['host1','host2',...]",
+                Name = "Config File",
                 Type = LaunchOptionType.String,
-                DefaultValue = "[]",
-                Options = ["--allow-origins"]
-            },
-            new LaunchOptionDefinition
-            {
-                Name = "Precision",
-                Type = LaunchOptionType.Bool,
-                Options = ["--precision auto", "--precision float16", "--precision float32"]
+                Options = ["--config"]
             },
             LaunchOptionDefinition.Extras
         ];
 
     public override IEnumerable<TorchIndex> AvailableTorchIndices =>
-        new[] { TorchIndex.Cpu, TorchIndex.Cuda, TorchIndex.Rocm, TorchIndex.Mps };
+        [TorchIndex.Cpu, TorchIndex.Cuda, TorchIndex.Rocm, TorchIndex.Mps];
 
     public override TorchIndex GetRecommendedTorchVersion()
     {
@@ -325,7 +295,7 @@ private async Task RunInvokeCommand(
         VenvRunner.UpdateEnvironmentVariables(env => GetEnvVars(env, installedPackagePath));
 
         // fix frontend build missing for people who updated to v3.6 before the fix
-        var frontendExistsPath = Path.Combine(installedPackagePath, RelativeFrontendBuildPath);
+        var frontendExistsPath = Path.Combine(installedPackagePath, relativeFrontendBuildPath);
         if (!Directory.Exists(frontendExistsPath))
         {
             await SetupAndBuildInvokeFrontend(
@@ -422,6 +392,11 @@ ProcessOutput s
     )
     {
         var invokeAiUrl = match.Value;
+        if (invokeAiUrl.Contains("0.0.0.0"))
+        {
+            invokeAiUrl = invokeAiUrl.Replace("0.0.0.0", "127.0.0.1");
+        }
+
         var invokeAiApi = RestService.For<IInvokeAiApi>(
             invokeAiUrl,
             new RefitSettings
diff --git a/StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs b/StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs
index 81f3717b..9428dd28 100644
--- a/StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs
+++ b/StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs
@@ -36,7 +36,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override TorchIndex GetRecommendedTorchVersion() =>
         HardwareHelper.PreferDirectMLOrZluda() ? TorchIndex.DirectMl : base.GetRecommendedTorchVersion();
 
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Recommended;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
 
     public override List<LaunchOptionDefinition> LaunchOptions
     {
diff --git a/StabilityMatrix.Core/Python/PipInstallArgs.cs b/StabilityMatrix.Core/Python/PipInstallArgs.cs
index bd161efa..915d7ede 100644
--- a/StabilityMatrix.Core/Python/PipInstallArgs.cs
+++ b/StabilityMatrix.Core/Python/PipInstallArgs.cs
@@ -65,6 +65,11 @@ public PipInstallArgs WithUserOverrides(List<PipPackageSpecifierOverride> overri
             if (string.IsNullOrWhiteSpace(pipOverride.Name))
                 continue;
 
+            if (pipOverride.Name is "--extra-index-url" or "--index-url")
+            {
+                pipOverride.Constraint = "=";
+            }
+
             var pipOverrideArg = pipOverride.ToArgument();
 
             if (pipOverride.Action is PipPackageSpecifierOverrideAction.Update)

From e4a57cdbba3c9eb01755930ef7610328799196f6 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Fri, 24 Jan 2025 16:41:41 -0800
Subject: [PATCH 2/5] chagenlog

---
 CHANGELOG.md | 52 ++++++----------------------------------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d0e4a52..f40daf0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,61 +5,21 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## v2.14.0-dev.2
-### Added
-- Added Align Your Steps scheduler to Inference
+## v2.13.3
 ### Changed
-- Updated the Civitai Model Browser base model selector to match the new Checkpoint Manager filter UI 
-- FaceDetailers in Inference will now inherit the primary sampler/scheduler/etc. by default. You can still manually set these by enabling the options via the ⚙️ button on the FaceDetailer card
-- Slightly rearranged the FaceDetailer card layout due to the above change
 - "Remove symbolic links on shutdown" option now also removes links from Output Sharing
 ### Fixed
-- Fixed crash when dragging & dropping images in Inference (hopefully)
-- Fixed HiresFix Inference addon not inheriting sampler/scheduler properly
-- Fixed some plus (+) buttons getting cut off in the Inference UI
-- Fixed CFG Rescale addon interfering with refiner model in Inference
 - Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
 - Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
 - Fixed issue when parsing index URLs in Python Dependencies Override menu
-- Fixed ComfyUI-Zluda not respecting pip user overrides
-- Fixed issue with Checkpoint Manager not displaying any models
+- Fixed issue where models were filtered incorrectly in the Checkpoint Manager
+- Fixed ComfyUI-Zluda not using the user-defined pip overrides
 ### Supporters
 #### Visionaries
-- A huge thank you to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your generous support is greatly appreciated!
-
-## v2.14.0-dev.1
-### Added
-- Added Rescale CFG addon to Inference
-- Added Swap Dimensions button between the width/height input in Inference
-- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
-- Added OpenModelDB tab to the Model Browser
-### Changed
-- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
-- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
-- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
-- Improved image metadata parsing - thanks to @Genteure!
-### Fixed
-- Fixed Inference image selector card buttons taking up the whole height of the card
-- Fixed Inference mask editor failing to paint to the right-most edge on large images
-- Fixed Inference mask editor not showing the entire image in certain circumstances
-- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
-- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
-- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
-### Supporters
-#### Visionaries
-- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
-
-## v2.13.3
-### Changed
-- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
-### Fixed
-- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
-- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
-- Fixed issue when parsing index URLs in Python Dependencies Override menu
+- A heartfelt thank you to our incredible Visionary-tier Patrons, **Waterclouds** and **TheTekknician**! Your unwavering support means the world to us!
+#### Pioneers
+- A big shoutout to our outstanding Pioneer-tier Patrons, **tankfox**, **Mr. Unknown**, **Szir777**, and **NowFallenAngel**! We deeply appreciate your ongoing support and dedication!
 
->>>>>>> fb81ebbb (Merge pull request #966 from ionite34/fixes-n-stuff)
 ## v2.13.2
 ### Changed
 - Removed SimpleSDXL due to security concerns - thanks to @iwr-redmond for the detailed report. For more information please visit https://github.com/LykosAI/StabilityMatrix/security/advisories.

From 2b540ee6b17f95581340cec911dfde9ce3e544ec Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Thu, 30 Jan 2025 12:10:25 -0800
Subject: [PATCH 3/5] Merge pull request #975 from
 ionite34/fix-right-click-console-crash

Fix right click console crash

(cherry picked from commit b998261d4c485eb016f4efe7309437f359c22adf)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                                  |  55 ++++++++++++++++++
 StabilityMatrix.Avalonia/App.axaml            |   2 -
 .../Assets/openai-white-logomark.png          | Bin 0 -> 6512 bytes
 .../StabilityMatrix.Avalonia.csproj           |   1 +
 .../Views/ConsoleOutputPage.axaml             |   7 ++-
 5 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 StabilityMatrix.Avalonia/Assets/openai-white-logomark.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f40daf0c..13f40eba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,57 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.14.0-dev.2
+### Added
+- Added Align Your Steps scheduler to Inference
+- Added wildcards to Inference prompts, e.g. `{blue|green|red}` will randomly select one of the colors
+- Added Safetensor Metadata viewer to the Checkpoint Manager context menu - thanks to @genteure!
+### Changed
+- Updated the Civitai Model Browser base model selector to match the new Checkpoint Manager filter UI 
+- FaceDetailers in Inference will now inherit the primary sampler/scheduler/etc. by default. You can still manually set these by enabling the options via the ⚙️ button on the FaceDetailer card
+- Slightly rearranged the FaceDetailer card layout due to the above change
+- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
+- Inference "Extra Networks" selector now filters extra networks based on the selected base model
+### Fixed
+- Fixed crash when dragging & dropping images in Inference (hopefully)
+- Fixed HiresFix Inference addon not inheriting sampler/scheduler properly
+- Fixed some plus (+) buttons getting cut off in the Inference UI
+- Fixed CFG Rescale addon interfering with refiner model in Inference
+- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
+- Fixed issue when parsing index URLs in Python Dependencies Override menu
+- Fixed ComfyUI-Zluda not respecting pip user overrides
+- Fixed issue with Checkpoint Manager not displaying any models
+- (dev.2 re-release) Fixed [#1120](https://github.com/LykosAI/StabilityMatrix/issues/1120) - crash when right clicking in the console after restarting a package
+### Supporters
+#### Visionaries
+- A huge thank you to our incredible Visionary-tier Patreon supporters, **Waterclouds**, **TheTekknician**, and our newest Visionary, **Corey**! Your generous support is greatly appreciated!
+
+## v2.14.0-dev.1
+### Added
+- Added Rescale CFG addon to Inference
+- Added Swap Dimensions button between the width/height input in Inference
+- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
+- Added OpenModelDB tab to the Model Browser
+### Changed
+- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
+- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
+- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
+- Improved image metadata parsing - thanks to @Genteure!
+### Fixed
+- Fixed Inference image selector card buttons taking up the whole height of the card
+- Fixed Inference mask editor failing to paint to the right-most edge on large images
+- Fixed Inference mask editor not showing the entire image in certain circumstances
+- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
+- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
+- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
+### Supporters
+#### Visionaries
+- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
+
+>>>>>>> b998261d (Merge pull request #975 from ionite34/fix-right-click-console-crash)
 ## v2.13.3
 ### Changed
 - "Remove symbolic links on shutdown" option now also removes links from Output Sharing
@@ -12,6 +63,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
 - Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
 - Fixed issue when parsing index URLs in Python Dependencies Override menu
+<<<<<<< HEAD
 - Fixed issue where models were filtered incorrectly in the Checkpoint Manager
 - Fixed ComfyUI-Zluda not using the user-defined pip overrides
 ### Supporters
@@ -19,6 +71,9 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - A heartfelt thank you to our incredible Visionary-tier Patrons, **Waterclouds** and **TheTekknician**! Your unwavering support means the world to us!
 #### Pioneers
 - A big shoutout to our outstanding Pioneer-tier Patrons, **tankfox**, **Mr. Unknown**, **Szir777**, and **NowFallenAngel**! We deeply appreciate your ongoing support and dedication!
+=======
+- Fixed [#1120](https://github.com/LykosAI/StabilityMatrix/issues/1120) - crash when right clicking in the console after restarting a package
+>>>>>>> b998261d (Merge pull request #975 from ionite34/fix-right-click-console-crash)
 
 ## v2.13.2
 ### Changed
diff --git a/StabilityMatrix.Avalonia/App.axaml b/StabilityMatrix.Avalonia/App.axaml
index c33e54b5..bbe5bbd2 100644
--- a/StabilityMatrix.Avalonia/App.axaml
+++ b/StabilityMatrix.Avalonia/App.axaml
@@ -41,8 +41,6 @@
             <SolidColorBrush x:Key="ToolTipBackground" Color="#1E1F22" />
             <SolidColorBrush x:Key="ToolTipForeground" Color="#9FBDC3" />
             <FontFamily x:Key="NotoSansJP">avares://StabilityMatrix.Avalonia/Assets/Fonts/NotoSansJP#Noto Sans JP</FontFamily>
-
-            <PathIcon x:Key="OpenAiIcon" Data="F1 M925.8 456.3C936.2 479.5 942.8 504.3 945.5 529.6C948.1 554.9 946.8 580.5 941.4 605.4C936.1 630.3 926.9 654.2 914.1 676.2C905.7 690.9 895.8 704.7 884.4 717.4C873.1 730 860.5 741.4 846.8 751.4C833 761.4 818.3 769.8 802.7 776.7C787.2 783.5 771 788.7 754.4 792.1C746.6 816.3 735 839.2 720 859.8C705.1 880.4 687 898.5 666.4 913.4C645.8 928.4 623 940 598.8 947.8C574.6 955.7 549.3 959.6 523.8 959.6C506.9 959.7 489.9 957.9 473.3 954.5C456.8 951 440.6 945.7 425.1 938.8C409.6 931.9 394.9 923.3 381.2 913.3C367.6 903.3 355 891.8 343.8 879.1C318.8 884.5 293.2 885.8 267.9 883.2C242.6 880.5 217.8 873.9 194.5 863.5C171.3 853.2 149.8 839.2 130.9 822.1C112 805 95.9001 785 83.2001 763C74.7001 748.3 67.7001 732.8 62.4001 716.7C57.1001 700.6 53.6001 684 51.8001 667.1C50.0001 650.3 50.1001 633.3 51.9001 616.4C53.7001 599.6 57.4001 583 62.7001 566.9C45.7001 548 31.7001 526.5 21.3001 503.3C11.0001 480 4.30011 455.3 1.70011 430C-0.999887 404.7 0.400113 379.1 5.70011 354.2C11.0001 329.3 20.2001 305.4 33.0001 283.4C41.4001 268.7 51.3001 254.8 62.6001 242.2C73.9001 229.6 86.6001 218.2 100.3 208.2C114 198.2 128.8 189.7 144.3 182.9C159.9 176 176.1 170.9 192.7 167.5C200.5 143.2 212.1 120.4 227 99.8C242 79.2 260.1 61.1 280.7 46.1C301.3 31.2 324.1 19.6 348.3 11.7C372.5 3.89997 397.8 -0.10003 423.3 -2.95639e-05C440.2 -0.10003 457.2 1.59997 473.8 5.09997C490.4 8.59997 506.6 13.8 522.1 20.7C537.6 27.7 552.3 36.2 566 46.2C579.7 56.3 592.3 67.7 603.5 80.4C628.4 75.1 654 73.8 679.3 76.4C704.6 79 729.3 85.7 752.6 96C775.8 106.4 797.3 120.3 816.2 137.4C835.1 154.4 851.2 174.3 863.9 196.4C872.4 211 879.4 226.5 884.7 242.7C890 258.8 893.6 275.4 895.3 292.3C897.1 309.2 897.1 326.2 895.2 343.1C893.4 360 889.7 376.6 884.4 392.7C901.5 411.6 915.4 433 925.8 456.3L925.8 456.3ZM592.6 883.2C614.4 874.2 634.2 860.9 650.9 844.2C667.6 827.5 680.9 807.7 689.9 785.8C698.9 764 703.6 740.6 703.6 717L703.6 494Q703.5 493.7 703.4 493.3Q703.3 493 703.1 492.7Q702.9 492.4 702.6 492.2Q702.3 491.9 702 491.8L621.3 445.2L621.3 714.6C621.3 717.3 620.9 720.1 620.2 722.7C619.5 725.4 618.5 727.9 617.1 730.3C615.7 732.7 614.1 734.9 612.1 736.8Q610.642 738.253 609.01 739.508Q607.379 740.763 605.6 741.8L414.5 852.1C412.9 853.1 410.2 854.5 408.8 855.3C416.7 862 425.3 867.9 434.3 873.1C443.4 878.3 452.8 882.7 462.6 886.3C472.4 889.8 482.5 892.5 492.7 894.3C503 896.1 513.4 897 523.8 897C547.4 897 570.8 892.3 592.6 883.2L592.6 883.2ZM137.5 731.8C149.4 752.3 165.1 770.1 183.8 784.5C202.6 798.9 223.9 809.4 246.7 815.5C269.5 821.6 293.3 823.2 316.7 820.1C340.1 817 362.6 809.4 383.1 797.6L576.3 686.1L576.8 685.6Q577 685.4 577.1 685Q577.3 684.7 577.4 684.4L577.4 590.4L344.2 725.3C341.8 726.7 339.3 727.7 336.7 728.5C334 729.2 331.3 729.5 328.5 729.5C325.8 729.5 323.1 729.2 320.4 728.5C317.8 727.7 315.2 726.7 312.8 725.3L121.7 614.9C120 613.9 117.5 612.4 116.1 611.5C114.3 621.8 113.4 632.2 113.4 642.6C113.4 653 114.4 663.4 116.2 673.7C118 683.9 120.8 694 124.3 703.8C127.9 713.6 132.3 723 137.5 732L137.5 731.8ZM87.3 314.8C75.5 335.3 67.9 357.9 64.8 381.3C61.7 404.7 63.3 428.4 69.4 451.3C75.5 474.1 86 495.4 100.4 514.2C114.8 532.9 132.7 548.6 153.1 560.4L346.2 672Q346.5 672.1 346.9 672.2L347.6 672.2Q348 672.2 348.3 672Q348.6 671.9 348.9 671.7L429.9 624.9L196.7 490.3C194.4 488.9 192.2 487.2 190.2 485.3Q188.747 483.842 187.492 482.21Q186.236 480.579 185.2 478.8C183.9 476.4 182.8 473.9 182.1 471.2C181.4 468.6 181 465.9 181.1 463.1L181.1 236C171.3 239.6 161.8 244 152.8 249.2C143.8 254.5 135.3 260.5 127.3 267.2C119.4 273.9 112 281.3 105.3 289.3C98.6 297.2 92.7 305.8 87.5 314.8L87.3 314.8ZM750.6 469.2C753 470.6 755.2 472.2 757.2 474.2C759.1 476.1 760.8 478.3 762.2 480.7C763.5 483.1 764.6 485.7 765.3 488.3C765.9 491 766.3 493.7 766.2 496.5L766.2 723.6C798.3 711.8 826.3 691.1 847 663.9C867.8 636.7 880.3 604.2 883.2 570.2C886.1 536.2 879.3 502 863.5 471.7C847.7 441.4 823.6 416.2 794 399.2L600.9 287.6Q600.6 287.5 600.2 287.4L599.5 287.4Q599.2 287.5 598.8 287.6Q598.5 287.7 598.2 287.9L517.6 334.5L750.8 469.2L750.6 469.2ZM831.1 348.2L831 348.2L831 348.3L831.1 348.2ZM831 348.1C836.8 314.5 832.9 279.9 819.7 248.4C806.6 216.9 784.7 189.8 756.7 170.2C728.7 150.7 695.7 139.5 661.6 138C627.4 136.6 593.6 144.9 564 161.9L370.9 273.4Q370.6 273.6 370.4 273.9L370 274.5Q369.9 274.8 369.8 275.2Q369.7 275.5 369.7 275.9L369.7 369.1L602.9 234.4C605.3 233 607.9 232 610.5 231.2C613.2 230.5 615.9 230.2 618.6 230.2C621.4 230.2 624.1 230.5 626.8 231.2C629.4 232 631.9 233 634.3 234.4L825.4 344.8C827.1 345.8 829.6 347.2 831 348.1ZM325.7 244.9C325.7 242.2 326.1 239.5 326.8 236.8C327.5 234.2 328.5 231.6 329.9 229.2C331.3 226.9 332.9 224.7 334.9 222.7C336.8 220.8 339 219.1 341.4 217.8L532.5 107.5C534.3 106.4 536.8 105 538.2 104.3C512 82.3999 480 68.3999 446.1 64.0999C412.2 59.6999 377.8 65.0999 346.9 79.5999C315.9 94.0999 289.7 117.2 271.4 146C253.1 174.9 243.4 208.3 243.4 242.5L243.4 465.5Q243.5 465.9 243.6 466.2Q243.7 466.5 243.9 466.8Q244.1 467.1 244.4 467.4Q244.6 467.6 245 467.8L325.7 514.4L325.7 244.9ZM369.5 539.6L473.4 599.6L577.3 539.6L577.3 419.7L473.5 359.7L369.6 419.7L369.5 539.6Z" />
         </ResourceDictionary>
     </Application.Resources>
 
diff --git a/StabilityMatrix.Avalonia/Assets/openai-white-logomark.png b/StabilityMatrix.Avalonia/Assets/openai-white-logomark.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bb20eb120b1a48145494edaeb2c40d16945f2c3
GIT binary patch
literal 6512
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

literal 0
HcmV?d00001

diff --git a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
index 133b2d5f..280a138d 100644
--- a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
+++ b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
@@ -150,6 +150,7 @@
         <AvaloniaResource Include="Assets\hf-packages.json" />
         <AvaloniaResource Include="Assets\santahat.png" />
         <AvaloniaResource Include="Assets\markdown.css" />
+        <AvaloniaResource Include="Assets\openai-white-logomark.png" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/StabilityMatrix.Avalonia/Views/ConsoleOutputPage.axaml b/StabilityMatrix.Avalonia/Views/ConsoleOutputPage.axaml
index 9bfd2f76..a834de73 100644
--- a/StabilityMatrix.Avalonia/Views/ConsoleOutputPage.axaml
+++ b/StabilityMatrix.Avalonia/Views/ConsoleOutputPage.axaml
@@ -115,8 +115,11 @@
                     <MenuItem
                         Command="{Binding SearchWithChatGptCommand}"
                         CommandParameter="{Binding ., ElementName=Console}"
-                        Header="Search with ChatGPT"
-                        Icon="{StaticResource OpenAiIcon}" />
+                        Header="Search with ChatGPT">
+                        <MenuItem.Icon>
+                            <controls:BetterAdvancedImage Source="avares://StabilityMatrix.Avalonia/Assets/openai-white-logomark.png" />
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </MenuFlyout>
             </avaloniaEdit:TextEditor.ContextFlyout>
         </avaloniaEdit:TextEditor>

From ce018e47e26df615fcfcad9da90fcb34cc6e631d Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Thu, 30 Jan 2025 12:15:14 -0800
Subject: [PATCH 4/5] chagenlog

---
 CHANGELOG.md | 56 +---------------------------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13f40eba..0acfbfee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,65 +5,14 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< HEAD
-=======
-## v2.14.0-dev.2
-### Added
-- Added Align Your Steps scheduler to Inference
-- Added wildcards to Inference prompts, e.g. `{blue|green|red}` will randomly select one of the colors
-- Added Safetensor Metadata viewer to the Checkpoint Manager context menu - thanks to @genteure!
-### Changed
-- Updated the Civitai Model Browser base model selector to match the new Checkpoint Manager filter UI 
-- FaceDetailers in Inference will now inherit the primary sampler/scheduler/etc. by default. You can still manually set these by enabling the options via the ⚙️ button on the FaceDetailer card
-- Slightly rearranged the FaceDetailer card layout due to the above change
-- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
-- Inference "Extra Networks" selector now filters extra networks based on the selected base model
-### Fixed
-- Fixed crash when dragging & dropping images in Inference (hopefully)
-- Fixed HiresFix Inference addon not inheriting sampler/scheduler properly
-- Fixed some plus (+) buttons getting cut off in the Inference UI
-- Fixed CFG Rescale addon interfering with refiner model in Inference
-- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
-- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
-- Fixed issue when parsing index URLs in Python Dependencies Override menu
-- Fixed ComfyUI-Zluda not respecting pip user overrides
-- Fixed issue with Checkpoint Manager not displaying any models
-- (dev.2 re-release) Fixed [#1120](https://github.com/LykosAI/StabilityMatrix/issues/1120) - crash when right clicking in the console after restarting a package
-### Supporters
-#### Visionaries
-- A huge thank you to our incredible Visionary-tier Patreon supporters, **Waterclouds**, **TheTekknician**, and our newest Visionary, **Corey**! Your generous support is greatly appreciated!
-
-## v2.14.0-dev.1
-### Added
-- Added Rescale CFG addon to Inference
-- Added Swap Dimensions button between the width/height input in Inference
-- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
-- Added OpenModelDB tab to the Model Browser
-### Changed
-- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
-- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
-- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
-- Improved image metadata parsing - thanks to @Genteure!
-### Fixed
-- Fixed Inference image selector card buttons taking up the whole height of the card
-- Fixed Inference mask editor failing to paint to the right-most edge on large images
-- Fixed Inference mask editor not showing the entire image in certain circumstances
-- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
-- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
-- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
-### Supporters
-#### Visionaries
-- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
-
->>>>>>> b998261d (Merge pull request #975 from ionite34/fix-right-click-console-crash)
 ## v2.13.3
 ### Changed
 - "Remove symbolic links on shutdown" option now also removes links from Output Sharing
 ### Fixed
 - Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed [#1120](https://github.com/LykosAI/StabilityMatrix/issues/1120) - crash when right clicking in the console after restarting a package
 - Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
 - Fixed issue when parsing index URLs in Python Dependencies Override menu
-<<<<<<< HEAD
 - Fixed issue where models were filtered incorrectly in the Checkpoint Manager
 - Fixed ComfyUI-Zluda not using the user-defined pip overrides
 ### Supporters
@@ -71,9 +20,6 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - A heartfelt thank you to our incredible Visionary-tier Patrons, **Waterclouds** and **TheTekknician**! Your unwavering support means the world to us!
 #### Pioneers
 - A big shoutout to our outstanding Pioneer-tier Patrons, **tankfox**, **Mr. Unknown**, **Szir777**, and **NowFallenAngel**! We deeply appreciate your ongoing support and dedication!
-=======
-- Fixed [#1120](https://github.com/LykosAI/StabilityMatrix/issues/1120) - crash when right clicking in the console after restarting a package
->>>>>>> b998261d (Merge pull request #975 from ionite34/fix-right-click-console-crash)
 
 ## v2.13.2
 ### Changed

From aee5e4b893f6a03fa7e13d4fabb64e7257cb9c03 Mon Sep 17 00:00:00 2001
From: jt <mohnjiles@gmail.com>
Date: Thu, 30 Jan 2025 18:32:31 -0800
Subject: [PATCH 5/5] chagenlog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0acfbfee..9a54cb91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
 ## v2.13.3
+### Added
+- Added Safetensor Metadata viewer to the Checkpoint Manager context menu - thanks to @genteure!
 ### Changed
 - "Remove symbolic links on shutdown" option now also removes links from Output Sharing
 ### Fixed
@@ -17,7 +19,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed ComfyUI-Zluda not using the user-defined pip overrides
 ### Supporters
 #### Visionaries
-- A heartfelt thank you to our incredible Visionary-tier Patrons, **Waterclouds** and **TheTekknician**! Your unwavering support means the world to us!
+- A heartfelt thank you to our incredible Visionary-tier Patrons, **Waterclouds**, **TheTekknician**, and **Corey**! Your unwavering support means the world to us!
 #### Pioneers
 - A big shoutout to our outstanding Pioneer-tier Patrons, **tankfox**, **Mr. Unknown**, **Szir777**, and **NowFallenAngel**! We deeply appreciate your ongoing support and dedication!