chagenlog

Author: mohnjiles

CHANGELOG.md

@@ -5,75 +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
-- 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
 #### Visionaries
 - 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