Merge pull request #186 from SubnauticaModding/dev

QMM 4.0.2.2 for SN1 - Bepinex Cache IO fix
SubnauticaModding · Aug 26, 2020 · afcf7cf · afcf7cf
2 parents 0397662 + e8348e3
commit afcf7cf
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 16 deletions.
diff --git a/Build/InstallerExtensions.dll b/Build/InstallerExtensions.dll
diff --git a/Build/QModInstaller.dll b/Build/QModInstaller.dll
diff --git a/Build/QModManager.QMMHarmonyShimmer.dll b/Build/QModManager.QMMHarmonyShimmer.dll
diff --git a/Build/QModManager.QMMLoader.dll b/Build/QModManager.QMMLoader.dll
diff --git a/Build/QModManager.QModPluginGenerator.dll b/Build/QModManager.QModPluginGenerator.dll
diff --git a/Build/QModManager.UnityAudioFixer.dll b/Build/QModManager.UnityAudioFixer.dll
diff --git a/Build/QModManager.exe b/Build/QModManager.exe
diff --git a/Build/QModManager_Setup.exe b/Build/QModManager_Setup.exe
diff --git a/Build/VortexPackage.zip b/Build/VortexPackage.zip
diff --git a/Data/latest-version.txt b/Data/latest-version.txt
@@ -1 +1 @@
-4.0.2.1
+4.0.2.2
diff --git a/Executable/Properties/AssemblyInfo.cs b/Executable/Properties/AssemblyInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("4.0.2.1")]
-[assembly: AssemblyFileVersion("4.0.2.1")]
+[assembly: AssemblyVersion("4.0.2.2")]
+[assembly: AssemblyFileVersion("4.0.2.2")]
diff --git a/Installer/Properties/AssemblyInfo.cs b/Installer/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
 
 [assembly: Guid("8c6c9a0b-80c4-43d2-89f2-749e6f09fdda")]
 
-[assembly: AssemblyVersion("4.0.2.1")]
-[assembly: AssemblyFileVersion("4.0.2.1")]
+[assembly: AssemblyVersion("4.0.2.2")]
+[assembly: AssemblyFileVersion("4.0.2.2")]
diff --git a/Installer/QModsInstallerScript.iss b/Installer/QModsInstallerScript.iss
@@ -5,7 +5,7 @@
 #endif
 
 #define Name "QModManager" ; The name of the game will be added after it
-#define Version "4.0.2.1"
+#define Version "4.0.2.2"
 #define Author "QModManager"
 #define URL "https://github.com/QModManager/QModManager"
 #define SupportURL "https://discord.gg/UpWuWwq"

diff --git a/QMMHarmonyShimmer/Properties/AssemblyInfo.cs b/QMMHarmonyShimmer/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.2.1")]
-[assembly: AssemblyFileVersion("4.0.2.1")]
+[assembly: AssemblyVersion("4.0.2.2")]
+[assembly: AssemblyFileVersion("4.0.2.2")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/QMMLoader/Properties/AssemblyInfo.cs b/QMMLoader/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.2.1")]
-[assembly: AssemblyFileVersion("4.0.2.1")]
+[assembly: AssemblyVersion("4.0.2.2")]
+[assembly: AssemblyFileVersion("4.0.2.2")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/QModManager/Patching/Patcher.cs b/QModManager/Patching/Patcher.cs
@@ -67,6 +67,7 @@ internal static void Patch()
                 {
                     Logger.Info("Folder structure:");
                     IOUtilities.LogFolderStructureAsTree();
+                    Logger.Info("Folder structure ended.");
                 }
                 catch (Exception e)
                 {

diff --git a/QModManager/Properties/AssemblyInfo.cs b/QModManager/Properties/AssemblyInfo.cs
@@ -13,8 +13,8 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("4.0.2.1")]
-[assembly: AssemblyFileVersion("4.0.2.1")]
+[assembly: AssemblyVersion("4.0.2.2")]
+[assembly: AssemblyFileVersion("4.0.2.2")]
 
 [assembly: InternalsVisibleTo("QMMTests")]
 [assembly: InternalsVisibleTo("QModManager")]

diff --git a/QModManager/Utility/IOUtilities.cs b/QModManager/Utility/IOUtilities.cs
@@ -9,6 +9,7 @@ internal static class IOUtilities
     {
         internal static readonly HashSet<string> BannedFolders = new HashSet<string>()
         {
+            ".backups",
             ".git",
             ".svn",
             "OST",

diff --git a/QModPluginEmulator/Properties/AssemblyInfo.cs b/QModPluginEmulator/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.2.1")]
-[assembly: AssemblyFileVersion("4.0.2.1")]
+[assembly: AssemblyVersion("4.0.2.2")]
+[assembly: AssemblyFileVersion("4.0.2.2")]
 [assembly: NeutralResourcesLanguage("en")]
 
 [assembly: InternalsVisibleTo("QModManager.QMMLoader")]
diff --git a/QModPluginEmulator/QModPluginGenerator.cs b/QModPluginEmulator/QModPluginGenerator.cs
@@ -155,6 +155,9 @@ private static void ClearBepInExCache()
                 throw new InvalidOperationException($"BepInEx Cache Path invalid! ({BepInExCachePath})");
             }
 
+            if (!Directory.Exists(BepInExCachePath))
+                return;
+
             Logger.LogInfo("Clearing BepInEx cache...");
             var stopwatch = Stopwatch.StartNew();
 

diff --git a/UnityAudioFixer/Properties/AssemblyInfo.cs b/UnityAudioFixer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.2.1")]
-[assembly: AssemblyFileVersion("4.0.2.1")]
+[assembly: AssemblyVersion("4.0.2.2")]
+[assembly: AssemblyFileVersion("4.0.2.2")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ internal static class IOUtilities @@
         {
             internal static readonly HashSet<string> BannedFolders = new HashSet<string>()
             {
+                ".backups",
                 ".git",
                 ".svn",
                 "OST",
@@ Expand Down @@