Skip to content

Commit

Permalink
Merge pull request #102 from BUTR/dev
Browse files Browse the repository at this point in the history
v1.5.1
  • Loading branch information
Aragas committed Apr 29, 2024
2 parents c166cb0 + 86cb8a8 commit 760907f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ jobs:
with:
name: bannerlord-${{matrix.project}}-${{matrix.configuration}}
path: ./bannerlord/
env:
BANNERLORD_BUTR_COMPATIBILITY_SCORE_URL: ${{ secrets.BANNERLORD_BUTR_COMPATIBILITY_SCORE_URL }}

###########################
# NEXUSMODS #
Expand Down
2 changes: 1 addition & 1 deletion build/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!--Development Variables-->
<PropertyGroup>
<Version>1.5.0</Version>
<Version>1.5.1</Version>
<HarmonyVersion>2.2.2</HarmonyVersion>
<BUTRSharedVersion>3.0.0.139</BUTRSharedVersion>
<BUTRModuleManagerVersion>5.0.222</BUTRModuleManagerVersion>
Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.5.1
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
* BETA Release!
* Fixed Update Recommendations
---------------------------------------------------------------------------------------------------
Version: 1.5.0
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
* BETA Release!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ internal static bool Enable(Harmony harmony)
AccessTools2.GetDelegate<TryAddFontDefinitionDelegate>(typeof(FontFactory), "TryAddFontDefinition");

private static readonly AddFontDefinitionDelegate? AddFontDefinitionOptimistic =
AddFontDefinition ?? new((instance, fontPath, fontName, spriteData) => TryAddFontDefinition?.Invoke(instance, fontPath, fontName, spriteData));
AddFontDefinition ?? ((instance, fontPath, fontName, spriteData) => TryAddFontDefinition?.Invoke(instance, fontPath, fontName, spriteData));

private static SpriteData WithData(this SpriteData spriteData, string spriteName)
{
Expand All @@ -59,7 +59,7 @@ private static SpriteData WithData(this SpriteData spriteData, string spriteName

private static void LoadAllFontsPostfix(ref FontFactory __instance)
{
if (AddFontDefinitionOptimistic is not AddFontDefinitionDelegate addFont)
if (AddFontDefinitionOptimistic is not { } addFont)
{
return;
}
Expand Down

0 comments on commit 760907f

Please sign in to comment.