Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2.9.12 #411

Merged
merged 2 commits into from
Sep 29, 2024
Merged

v2.9.12 #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4884cfa
Added explicit v1.2.11 support
Aragas Sep 26, 2024
64c7ab6
Added OS info in the Crash Report renders
Aragas Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectExtensionDataStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions supported-game-versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
v1.2.11
v1.2.10
v1.2.9
v1.2.8
Expand Down
Loading