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/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);
}
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..7ec88003 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/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..bbd213b1 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit caf5f0e0135e3bc1c5e47403de6da141ae2d4941
+Subproject commit bbd213b1228c1cc20224c7d1e5c637b64f629153