diff --git a/build/common.props b/build/common.props index 5b35fdee..885f9b23 100644 --- a/build/common.props +++ b/build/common.props @@ -5,7 +5,7 @@ 1.0.0 - 2.9.11 + 2.9.12 2.2.2 3.2.0.77 @@ -18,7 +18,7 @@ 1.1.0.104 3.0.0.142 5.0.226 - 14.0.0.84 + 14.0.0.87 diff --git a/changelog.txt b/changelog.txt index 1fc52d31..2ef612b7 100644 --- 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 index cec28adb..f6be56f0 100644 --- a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs +++ b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs @@ -53,7 +53,7 @@ public override IReadOnlyList 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 index b167ae58..f30e1c38 100755 --- 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 index 3af620f8..ff062ed8 100644 --- 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 index 327200c5..443559b3 100644 --- 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