瀏覽代碼

Fix merge conflict

ghorsington 4 年之前
父節點
當前提交
dc6c76b59f
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      BepInEx.Preloader/Preloader.cs

+ 5 - 4
BepInEx.Preloader/Preloader.cs

@@ -289,10 +289,11 @@ namespace BepInEx.Preloader
 			true,
 			"Enables or disables runtime patches.\nThis should always be true, unless you cannot start the game due to a Harmony related issue (such as running .NET Standard runtime) or you know what you're doing.");
 
-		private static readonly ConfigEntry<bool> ConfigPreloaderCOutLogging = ConfigFile.CoreConfig.Bind(
-			"Logging", "PreloaderConsoleOutRedirection",
-			true,
-			"Redirects text from Console.Out during preloader patch loading to the BepInEx logging system.");
+		private static readonly ConfigEntry<MonoModBackend> HarmonyBackend = ConfigFile.CoreConfig.Bind(
+			"Preloader",
+			"HarmonyBackend",
+			MonoModBackend.auto,
+			"Specifies which MonoMod backend to use for Harmony patches. Auto uses the best available backend.\nThis setting should only be used for development purposes (e.g. debugging in dnSpy). Other code might override this setting.");
 
 		#endregion
 	}