- Fixed a bug where custom file additions could be downgraded to base file modification mods.

Author: Lunaretic

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -2100,7 +2100,6 @@ await Task.Run(async () =>
                 // Time to pull in the Model Modifier for any extra steps before we pass
                 // it to the raw MDL creation function.
 
-                loggingFunction(false, "Merging in existing Attribute & Material Data...");
 
                 XivMdl ogMdl = null;
 
@@ -2116,6 +2115,8 @@ await Task.Run(async () =>
                     ogMdl = currentMdl;
                 }
 
+                loggingFunction(false, "Merging in existing Attribute & Material Data...");
+
                 // Apply our Model Modifier options to the model.
                 options.Apply(ttModel, currentMdl, ogMdl, loggingFunction);
 

xivModdingFramework/SqPack/FileTypes/Dat.cs

@@ -1548,6 +1548,7 @@ public async Task<long> WriteToDat(List<byte> importData, Mod modEntry, string i
 
             var NewFilesNeedToBeAdded = !await index.FileExists(HashGenerator.GetHash(Path.GetFileName(internalFilePath)), HashGenerator.GetHash($"{Path.GetDirectoryName(internalFilePath).Replace("\\", "/")}"), dataFile);
             var IsTexToolsAddedFileFlag = await index.FileExists(HashGenerator.GetHash(Path.GetFileName(internalFilePath + ".flag")), HashGenerator.GetHash($"{Path.GetDirectoryName(internalFilePath).Replace("\\", "/")}"), dataFile);
+            NewFilesNeedToBeAdded = NewFilesNeedToBeAdded || IsTexToolsAddedFileFlag || (modEntry != null && modEntry.IsCustomFile());
 
             var datNum = 0;
             var modDatPath = "";