Merge pull request #684 from qsb-dev/dev

JohnCorby · web-flow · commit 875d74491265 · 2024-04-25T15:39:27.000-07:00
1.1.1
diff --git a/QSB/QSBCore.cs b/QSB/QSBCore.cs
@@ -385,6 +385,11 @@ static void Init(Assembly assembly)
 		DebugLog.DebugWrite("Running RuntimeInitializeOnLoad methods for our assemblies", MessageType.Info);
 		foreach (var path in Directory.EnumerateFiles(Helper.Manifest.ModFolderPath, "*.dll"))
 		{
+			if (Path.GetFileNameWithoutExtension(path) == "QSB-NH")
+			{
+				continue;
+			}
+
 			var assembly = Assembly.LoadFile(path);
 			Init(assembly);
 		}
diff --git a/QSB/manifest.json b/QSB/manifest.json
@@ -4,7 +4,7 @@
 	"author": "Nebula, John, Alek, & Rai",
 	"name": "Quantum Space Buddies",
 	"uniqueName": "Raicuparta.QuantumSpaceBuddies",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"owmlVersion": "2.11.1",
 	"dependencies": [ "_nebula.MenuFramework", "JohnCorby.VanillaFix" ],
 	"pathsToPreserve": [ "debugsettings.json" ],

Original file line number	Diff line number	Diff line change
`@@ -385,6 +385,11 @@ static void Init(Assembly assembly)`
`385`	`385`	`DebugLog.DebugWrite("Running RuntimeInitializeOnLoad methods for our assemblies", MessageType.Info);`
`386`	`386`	`foreach (var path in Directory.EnumerateFiles(Helper.Manifest.ModFolderPath, "*.dll"))`
`387`	`387`	`{`
	`388`	`+ if (Path.GetFileNameWithoutExtension(path) == "QSB-NH")`
	`389`	`+ {`
	`390`	`+ continue;`
	`391`	`+ }`
	`392`	`+`
`388`	`393`	`var assembly = Assembly.LoadFile(path);`
`389`	`394`	`Init(assembly);`
`390`	`395`	`}`