diff --git a/Glamourer/Gui/GlamourerChangelog.cs b/Glamourer/Gui/GlamourerChangelog.cs index 505279e..ab51af6 100644 --- a/Glamourer/Gui/GlamourerChangelog.cs +++ b/Glamourer/Gui/GlamourerChangelog.cs @@ -26,6 +26,7 @@ public class GlamourerChangelog Add1_0_6_0(Changelog); Add1_0_7_0(Changelog); Add1_1_0_0(Changelog); + Add1_1_0_2(Changelog); } private (int, ChangeLogDisplayType) ConfigData() @@ -46,6 +47,16 @@ public class GlamourerChangelog } } + private static void Add1_1_0_2(Changelog log) + => log.NextVersion("Version 1.1.0.2") + .RegisterEntry("Added design colors in the preview of combos (in the quick bar and the automation panel).") + .RegisterHighlight("Improved Palette+ import options: Instead of entering a name, you can now select from available palettes.") + .RegisterHighlight("In the settings tab, there is also a button to import ALL palettes from Palette+ as separate designs.", 1) + .RegisterEntry("Fixed an issue with the favourites file not loading.") + .RegisterEntry("Fixed the name of the advanced parameters in the application panel.") + .RegisterEntry("Fixed design clones not respecting advanced parameter application rules."); + + private static void Add1_1_0_0(Changelog log) => log.NextVersion("Version 1.1.0.0") .RegisterHighlight("Added a new tab to browse, apply or copy (human) NPC appearances.") diff --git a/Glamourer/Unlocks/FavoriteManager.cs b/Glamourer/Unlocks/FavoriteManager.cs index 6d0a3ab..33242c9 100644 --- a/Glamourer/Unlocks/FavoriteManager.cs +++ b/Glamourer/Unlocks/FavoriteManager.cs @@ -56,15 +56,15 @@ public class FavoriteManager : ISavable else { var load = JsonConvert.DeserializeObject(text); - switch (load.Version) + switch (load?.Version ?? 0) { case 1: - _favorites.UnionWith(load.FavoriteItems.Select(i => (ItemId)i)); - _favoriteColors.UnionWith(load.FavoriteColors.Select(i => (StainId)i)); - _favoriteHairStyles.UnionWith(load.FavoriteHairStyles.Select(t => new FavoriteHairStyle(t))); + _favorites.UnionWith(load!.FavoriteItems.Select(i => (ItemId)i)); + _favoriteColors.UnionWith(load!.FavoriteColors.Select(i => (StainId)i)); + _favoriteHairStyles.UnionWith(load!.FavoriteHairStyles.Select(t => new FavoriteHairStyle(t))); break; - default: throw new Exception($"Unknown Version {load.Version}"); + default: throw new Exception($"Unknown Version {load?.Version ?? 0}"); } } } diff --git a/Penumbra.GameData b/Penumbra.GameData index 08cd678..d732a0f 160000 --- a/Penumbra.GameData +++ b/Penumbra.GameData @@ -1 +1 @@ -Subproject commit 08cd678b4fe8d2fd34a326fe9d0904508f07b598 +Subproject commit d732a0fccbed724878dd361ed60635695f10aebd