Merge pull request #411 from BUTR/dev

v2.9.12
BUTR · Sep 29, 2024 · b52d7e3 · b52d7e3
2 parents e4a164b + 64c7ab6
commit b52d7e3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/build/common.props b/build/common.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <BaseGameVersion>1.0.0</BaseGameVersion>
     <!--Module Version-->
-    <Version>2.9.11</Version>
+    <Version>2.9.12</Version>
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>
@@ -18,7 +18,7 @@
     <BuildResourcesVersion>1.1.0.104</BuildResourcesVersion>
     <BUTRSharedVersion>3.0.0.142</BUTRSharedVersion>
     <BUTRModuleManagerVersion>5.0.226</BUTRModuleManagerVersion>
-    <CrashReportVersion>14.0.0.84</CrashReportVersion>
+    <CrashReportVersion>14.0.0.87</CrashReportVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.9.12
+Game Versions: v1.0.x,v1.1.x,v1.2.x
+* Added OS info in the Crash Report renders
+---------------------------------------------------------------------------------------------------
 Version: 2.9.11
 Game Versions: v1.0.x,v1.1.x,v1.2.x
 * Updated Crash Reporter to v14

diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs
@@ -53,7 +53,7 @@ public override IReadOnlyList<HotKeyBase> Build()
 
 #if v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116
         TWHotKeyManager.RegisterInitialContexts(new[] { hotKeyCategoryContainer }, true);
-#elif v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 || v1210
+#elif v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 || v1210 || v1211
         TWHotKeyManager.RegisterInitialContexts(TWHotKeyManager.GetAllCategories().ToList().Concat(new[] { hotKeyCategoryContainer }), true);
 #else
 #error DEFINE

diff --git a/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectExtensionDataStore.cs b/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectExtensionDataStore.cs
@@ -108,7 +108,7 @@ private sealed record DataKey([field: SaveableField(0)] MBGUID ObjectId, [field:
 
 #if v100 || v101 || v102 || v103 || v110 || v111 || v112 || v113 || v114 || v115 || v116
         private sealed class SavedTypeDefiner : SaveableCampaignBehaviorTypeDefiner
-#elif v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 || v1210
+#elif v120 || v121 || v122 || v123 || v124 || v125 || v126 || v127 || v128 || v129 || v1210 || v1211
     private sealed class SavedTypeDefiner : SaveableTypeDefiner
 #else
 #error DEFINE

diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs b/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs
@@ -94,6 +94,9 @@ public void Enable()
         else if (_disableWhenDebuggerIsAttached)
             return;
 
+        // What should we do if BLSE is present, but the we disabled the exception handler there
+        // but DisableWhenDebuggerIsAttached is false?
+        // Right now it still will have the exception handler disabled, since BLSE's settings take precedence.
         if (!_wasButrLoaderInterceptorCalled)
         {
             BEWPatch.Enable(Harmony);

diff --git a/supported-game-versions.txt b/supported-game-versions.txt
@@ -1,3 +1,4 @@
+v1.2.11
 v1.2.10
 v1.2.9
 v1.2.8
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    v1.2.11
     v1.2.10
     v1.2.9
     v1.2.8
@@ Expand Down @@