Merge branch 'beta' of https://github.com/RustMapMaking/Editor into beta

Adsito · Adsito · commit e018790a3bb0 · 2020-07-21T23:52:57.000+10:00
diff --git a/Assets/MapEditor/Managers/AssetManager.cs b/Assets/MapEditor/Managers/AssetManager.cs
@@ -37,7 +37,7 @@ public static void Initialise(string bundlesRoot)
 				return;
 			}
 
-			if (!SettingsManager.RustDirectory.EndsWith("Rust"))
+			if (!SettingsManager.RustDirectory.EndsWith("Rust") && !SettingsManager.RustDirectory.EndsWith("RustStaging"))
             {
 				Debug.LogError("Not a valid Rust install directory: " + SettingsManager.RustDirectory);
 				return;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public static void Initialise(string bundlesRoot)`
`37`	`37`	`return;`
`38`	`38`	`}`
`39`	`39`
`40`		`- if (!SettingsManager.RustDirectory.EndsWith("Rust"))`
	`40`	`+ if (!SettingsManager.RustDirectory.EndsWith("Rust") && !SettingsManager.RustDirectory.EndsWith("RustStaging"))`
`41`	`41`	`{`
`42`	`42`	`Debug.LogError("Not a valid Rust install directory: " + SettingsManager.RustDirectory);`
`43`	`43`	`return;`