Skip to content

Commit

Permalink
Merge pull request #391 from BUTR/dev
Browse files Browse the repository at this point in the history
v2.9.7
  • Loading branch information
Aragas authored Apr 12, 2024
2 parents bbc8a8d + 62eb529 commit 7a3f4f7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
6 changes: 3 additions & 3 deletions build/common.props
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.6</Version>
<Version>2.9.7</Version>
<!--Harmony Version-->
<HarmonyVersion>2.2.2</HarmonyVersion>
<HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>
Expand All @@ -17,8 +17,8 @@
<!--BuildResources Version-->
<BuildResourcesVersion>1.1.0.104</BuildResourcesVersion>
<BUTRSharedVersion>3.0.0.138</BUTRSharedVersion>
<BUTRModuleManagerVersion>5.0.221</BUTRModuleManagerVersion>
<CrashReportVersion>13.0.0.78</CrashReportVersion>
<BUTRModuleManagerVersion>5.0.222</BUTRModuleManagerVersion>
<CrashReportVersion>13.0.0.81</CrashReportVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------------------------------
Version: 2.9.7
Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.x
* Fixed UpdateInfo parsing for Crash Reports
---------------------------------------------------------------------------------------------------
Version: 2.9.6
Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.1.6,v1.2.x
* More Crash Report related fixes. Fixed WinForms renderer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ModuleCategory value="Singleplayer" />
<ModuleType value="Community"/>
<Url value="https://www.nexusmods.com/mountandblade2bannerlord/mods/2018" />
<UpdateInfo value="NexusMods:2018" />
<UpdateInfo value="NexusMods:2018;GitHub:BUTR/Bannerlord.ButterLib" />
<DependedModules>
<!-- Uncomment when doing ExtensionVersion > 2.0.0
<DependedModule Id="BLSE.AssemblyResolver" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public IEnumerable<StacktraceEntry> Filter(ICollection<StacktraceEntry> stacktra
{
continue;
}

if (stacktraceEntry.Method.DeclaringType == typeof(SubModuleWrappers2.MBSubModuleBaseWrapper))
{
continue;
Expand Down Expand Up @@ -89,12 +89,12 @@ private IEnumerable<MethodEntry> FilterPatches(ICollection<MethodEntry> patches)
{
continue;
}

if (patch.LoaderPluginInfo?.Id == "BLSE.ExceptionInterceptor")
{
continue;
}

if (patch.ModuleInfo?.Id == "Bannerlord.Harmony")
{
if (patch.Method.DeclaringType?.FullName == "Bannerlord.Harmony.SubModule")
Expand All @@ -105,7 +105,7 @@ private IEnumerable<MethodEntry> FilterPatches(ICollection<MethodEntry> patches)
}
}
}

yield return patch;
}
}
Expand Down

0 comments on commit 7a3f4f7

Please sign in to comment.