Update v3.0.7.4

TexTools · Jul 18, 2024 · bb5211f · bb5211f
2 parents 6ac6096 + 59f93c8
commit bb5211f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,9 +23,9 @@
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
 
-    <ApplicationVersion>3.0.7.3</ApplicationVersion>
-    <AssemblyVersion>3.0.7.3</AssemblyVersion>
-    <FileVersion>3.0.7.3</FileVersion>
+    <ApplicationVersion>3.0.7.4</ApplicationVersion>
+    <AssemblyVersion>3.0.7.4</AssemblyVersion>
+    <FileVersion>3.0.7.4</FileVersion>
 
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs b/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
@@ -839,7 +839,8 @@ private async Task GetMaterials(ModTransaction tx)
             }
 
             HashSet<string> foundMaterials = new HashSet<string>();
-            if (Root != null && Root.Info.PrimaryType == XivItemType.human && Root.Info.SecondaryType == XivItemType.body)
+            if (Root != null && ((Root.Info.PrimaryType == XivItemType.human && Root.Info.SecondaryType == XivItemType.body)
+                || Root.Info.IsHumanMaterialVersionException()))
             {
                 // Exceptions class.
                 var materials = await Root.GetMaterialFiles(-1, tx, false);

diff --git a/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs b/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs
@@ -429,6 +429,14 @@ private static string SetDefault(string value, string def)
 
         public static string GetDefaultInstallDirectory()
         {
+            var qlDir = PenumbraAPI.GetQuickLauncherGameDirectory();
+
+            // If the user has the quick launcher configured, use that.
+            if (!string.IsNullOrWhiteSpace(qlDir))
+            {
+                return qlDir;
+            }
+
             var resourceManager = CommonInstallDirectories.ResourceManager;
             var resourceSet = resourceManager.GetResourceSet(CultureInfo.CurrentCulture, true, true);
 

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
+38 −17		xivModdingFramework/Cache/XivDependencyRoot.cs
+21 −0		xivModdingFramework/Helpers/PenumbraAPI.cs
+1 −1		xivModdingFramework/Models/DataContainers/TTModel.cs
+22 −7		xivModdingFramework/Models/FileTypes/Mdl.cs