Remove Variant/Version token, fix a bug with simple file list loading for PMPS

Author: Lunaretic

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -84,7 +84,6 @@ public enum EMaterialFlags2 : ushort
     public class XivMtrl : ICloneable
     {
         public const string ItemPathToken = "{item_folder}";
-        public const string MaterialSetToken = "{version}";
         public const string TextureNameToken = "{default_name}";
         public const string CommonPathToken = "{shared_folder}";
 
@@ -559,12 +558,6 @@ public string TokenizePath(string path, XivTexType usage)
             path = path.Replace(commonPath, XivMtrl.CommonPathToken);
 
 
-            var version = GetVariantString();
-            if (version != "")
-            {
-                path = path.Replace(version, XivMtrl.MaterialSetToken);
-            }
-
             //var texName = GetDefaultTexureName(usage, false);
             //path = path.Replace(texName, XivMtrl.TextureNameToken);
             return path;
@@ -590,7 +583,6 @@ public string DetokenizePath(string path, MtrlTexture texture)
 
 
             path = path.Replace(ItemPathToken, rootPath);
-            path = path.Replace(MaterialSetToken, variantString);
             path = path.Replace(CommonPathToken, GetCommonTextureDirectory());
             return path;
         }

xivModdingFramework/Mods/FileTypes/PMP.cs

@@ -909,7 +909,8 @@ internal static async Task<Dictionary<string, FileStorageInformation>> UnpackPMP
 
                 var defMod = pmp.DefaultMod as PmpStandardOptionJson;
                 PmpStandardOptionJson option = null;
-                if (defMod != null && (defMod.FileSwaps.Count > 0 || defMod.Manipulations.Count > 0 || defMod.Files.Count > 0))
+
+                if (defMod != null && (defMod.FileSwaps.Count > 0 || defMod.Manipulations.Count > 0 || defMod.Files.Count > 0) && pmp.Groups.Count == 0)
                 {
                     // Valid Default Mod Option
                     option = defMod;