From 7e4745ba3b6c22fa67a70cb07f2ea27d51401784 Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sat, 13 Jul 2024 13:47:12 -0400 Subject: [PATCH 1/6] Treat skipped mods as unchanged rather than failed. --- .../Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs | 2 +- lib/xivModdingFramework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs index c51b7d9b..fd3bcd8c 100644 --- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs +++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs @@ -450,7 +450,7 @@ private void SkipItems_Click(object sender, RoutedEventArgs e) foreach(KeyValuePair kv in items) { if (Results.Upgrades.ContainsKey(kv.Key)) { - Results.Upgrades[kv.Key] = PenumbraUpgradeStatus.EUpgradeResult.Failure; + Results.Upgrades[kv.Key] = PenumbraUpgradeStatus.EUpgradeResult.Unchanged; try { diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index caf5f0e0..e8ed6c38 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit caf5f0e0135e3bc1c5e47403de6da141ae2d4941 +Subproject commit e8ed6c38d81949b3779e1162db2abda6d8461d76 From 6ecc5c5b8ca6c2f8e5be294eb5ecb667a0deffa0 Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sat, 13 Jul 2024 13:47:21 -0400 Subject: [PATCH 2/6] Fix some modlist ui stuff. --- FFXIV_TexTools/ViewModels/ModListViewModel.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/FFXIV_TexTools/ViewModels/ModListViewModel.cs b/FFXIV_TexTools/ViewModels/ModListViewModel.cs index 6dd064e6..4a47dd5a 100644 --- a/FFXIV_TexTools/ViewModels/ModListViewModel.cs +++ b/FFXIV_TexTools/ViewModels/ModListViewModel.cs @@ -448,12 +448,17 @@ public async Task UpdateList(Category category, CancellationTokenSource cts) { modPackCategory = modPackCategory.ParentCategory; } + var mpName = modPackCategory.Name; + if(mpName == UIStrings.Standalone_Non_ModPack) + { + mpName = ""; + } foreach (var mod in allMods) { if (!mod.ItemName.Equals(category.Name)) continue; - if (mod.ModPack == modPackCategory.Name) + if (mod.ModPack == mpName) { modItems.Add(mod); } From 27fb47da6e47b690888bd7ebe2a61f5aacd9ca65 Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sat, 13 Jul 2024 14:04:16 -0400 Subject: [PATCH 3/6] Reduce reflection value due to skin discoloration. Update dawntrail upgrade disclaimer. --- .../ViewModels/Viewport3DViewModel.cs | 2 +- .../Controls/DawnTrailUpgradeDisclaimer.xaml | 21 ++++++++++--------- lib/xivModdingFramework | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs b/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs index 93501ef4..b4b3e4b3 100644 --- a/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs +++ b/FFXIV_TexTools/ViewModels/Viewport3DViewModel.cs @@ -788,7 +788,7 @@ public float LightingZValue } } - private int _ReflectionValue = 5; + private int _ReflectionValue = 2; public int ReflectionValue { get => _ReflectionValue; diff --git a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml index 627219d0..7bd7b146 100644 --- a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml +++ b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml @@ -86,7 +86,7 @@ - + @@ -104,7 +104,8 @@ - + + @@ -112,9 +113,9 @@ - - - + + + @@ -126,13 +127,13 @@ - - - + + + - + @@ -142,7 +143,7 @@ - + diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index e8ed6c38..02a871bb 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit e8ed6c38d81949b3779e1162db2abda6d8461d76 +Subproject commit 02a871bba3ea334f95656691017b2292969f06d2 From 54a6bc6f16955298e531cdd047767e21d867a8df Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sat, 13 Jul 2024 14:23:13 -0400 Subject: [PATCH 4/6] Disclaimer tweaks --- FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml index 7bd7b146..5172b6a3 100644 --- a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml +++ b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml @@ -129,7 +129,7 @@ - + From a5904d347742465724612261873b62148a265621 Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sat, 13 Jul 2024 14:24:02 -0400 Subject: [PATCH 5/6] ver --- FFXIV_TexTools/FFXIV_TexTools.csproj | 4 ++-- FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj index 6484baa2..83e8938b 100644 --- a/FFXIV_TexTools/FFXIV_TexTools.csproj +++ b/FFXIV_TexTools/FFXIV_TexTools.csproj @@ -23,8 +23,8 @@ FFXIV_TexTools Copyright © 2024 - 3.0.5.6 - 3.0.5.6 + 3.0.6.0 + 3.0.6.0 3.0.5.6 9.0 diff --git a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml index 5172b6a3..7ec88003 100644 --- a/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml +++ b/FFXIV_TexTools/Views/Controls/DawnTrailUpgradeDisclaimer.xaml @@ -129,7 +129,7 @@ - + From fb6a9f8dd1a35f8d74e8e9bd7fe8b491a16a8be9 Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sat, 13 Jul 2024 14:24:49 -0400 Subject: [PATCH 6/6] Update Framework Reference to Update v3.0.6.0 --- lib/xivModdingFramework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index 02a871bb..bbd213b1 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit 02a871bba3ea334f95656691017b2292969f06d2 +Subproject commit bbd213b1228c1cc20224c7d1e5c637b64f629153