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.

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

v1.4.8 #80

Merged
merged 19 commits into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Code Formatting
uses: butr/actions-code-format-setup@v1.5
uses: butr/actions-code-format-setup@v1
with:
workspace: "src/Bannerlord.BLSE.sln"
github-token: ${{ secrets.GITHUB_TOKEN }}
147 changes: 78 additions & 69 deletions README.md

Large diffs are not rendered by default.

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.4.7</Version>
<Version>1.4.8</Version>
<HarmonyVersion>2.2.2</HarmonyVersion>
<BUTRSharedVersion>3.0.0.137</BUTRSharedVersion>
<BUTRModuleManagerVersion>5.0.209</BUTRModuleManagerVersion>
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: 1.4.8
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.2.0,v1.2.1,v1.2.2,v1.2.3
* Better descriptions for certain misinstallation cases
---------------------------------------------------------------------------------------------------
Version: 1.4.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.2.0
* Fixed ReShade and Special K loading. At the moment they do not work together
Expand Down
10 changes: 7 additions & 3 deletions src/Bannerlord.BLSE.Loaders.Standalone/GameConsistencyChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ internal static class GameConsistencyChecker
{
public static void Verify()
{
var platform = new FileInfo(typeof(GameConsistencyChecker).Assembly.Location).Directory!.Name;
var assemblyFile = new FileInfo(typeof(GameConsistencyChecker).Assembly.Location);

var platform = assemblyFile.Directory!.Name;
if (platform is not "Win64_Shipping_Client" and not "Gaming.Desktop.x64_Shipping_Client")
{
MessageBox.Show($"""
Expand All @@ -21,13 +23,15 @@ The BLSE containing folder is named '{platform}'
Environment.Exit(1);
}


var twLibrary = new FileInfo("TaleWorlds.Library.dll");
if (!twLibrary.Exists)
{
MessageBox.Show($"""
Failed to find the necessary game files!
Make sure BLSE is installed in '%GAME FOLDER%/bin/{platform}''
Make sure BLSE is installed in '%GAME FOLDER%/bin/%PLATFORM%'
Where %PLATFORM% is:
* 'Win64_Shipping_Client' for Steam/GOG/Epic Games
* 'Gaming.Desktop.x64_Shipping_Client' for Xbox Game Pass PC
""", "Error from BLSE!", MessageBoxButtons.OK, MessageBoxIcon.Error);
Environment.Exit(1);
}
Expand Down
14 changes: 14 additions & 0 deletions src/Bannerlord.BLSE.Shared/ModuleInitializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ The Harmony module is missing!
If the module was installed manually, make sure that the module in installed in 'Modules/Bannerlord.Harmony'!
If Vortex is used, try to reinstall manually!
If Steam is used, download the Harmony mod from NexusMods!
Don't forget that on Steam you have the '/Modules' folder in the Game
and the Steam Workshop folder that can conflict with each other!
""", "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
Environment.Exit(1);
return null;
Expand All @@ -51,6 +53,8 @@ The Harmony module is corrupted!
If the module was installed manually, try to do a clean reinstall!
If Vortex is used, try to reinstall manually!
If Steam is used, download the Harmony mod from NexusMods!
Don't forget that on Steam you have the '/Modules' folder in the Game
and the Steam Workshop folder that can conflict with each other!
""", "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
Environment.Exit(1);
return null;
Expand All @@ -62,6 +66,8 @@ Failed to read '{ModuleInfoHelper.SubModuleFile}'!
If the module was installed manually, try to do a clean reinstall!
If Vortex is used, try to reinstall manually!
If Steam is used, download the Harmony mod from NexusMods!
Don't forget that on Steam you have the '/Modules' folder in the Game
and the Steam Workshop folder that can conflict with each other!
""", "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
Environment.Exit(1);
return null;
Expand All @@ -73,6 +79,8 @@ At least v2.2.2.x is required!
If the module was installed manually, find and install the latest version!
If Vortex is used, try to reinstall manually the latest version!
If Steam is used, download the latest Harmony mod from NexusMods!
Don't forget that on Steam you have the '/Modules' folder in the Game
and the Steam Workshop folder that can conflict with each other!
""", "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
Environment.Exit(1);
return null;
Expand All @@ -84,6 +92,8 @@ The Harmony module is corrupted!
If the module was installed manually, try to do a clean reinstall!
If Vortex is used, try to reinstall manually!
If Steam is used, download the Harmony mod from NexusMods!
Don't forget that on Steam you have the '/Modules' folder in the Game
and the Steam Workshop folder that can conflict with each other!
""", "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
Environment.Exit(1);
return null;
Expand All @@ -95,6 +105,8 @@ The Harmony module is corrupted!
If the module was installed manually, try to do a clean reinstall!
If Vortex is used, try to reinstall manually!
If Steam is used, download the Harmony mod from NexusMods!
Don't forget that on Steam you have the '/Modules' folder in the Game
and the Steam Workshop folder that can conflict with each other!
""", "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
Environment.Exit(1);
return null;
Expand Down Expand Up @@ -179,6 +191,8 @@ Wrong 0Harmony.dll version! At least v2.2.2.x is required!
If the module was installed manually, try to do a clean reinstall!
If Vortex is used, try to reinstall manually!
If Steam is used, download the Harmony mod from NexusMods!
Don't forget that on Steam you have the '/Modules' folder in the Game
and the Steam Workshop folder that can conflict with each other!
""", "Error from BLSE!", MessageBoxButtons.Ok, MessageBoxIcon.Error);
Environment.Exit(1);
return null;
Expand Down
2 changes: 1 addition & 1 deletion src/Bannerlord.LauncherEx/Bannerlord.LauncherEx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="StbSharp" Version="0.7.2.38" PrivateAssets="all" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="Vanara.Core" Version="3.4.14" />
<PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup>

<Target Name="SetLauncherExMetadata" BeforeTargets="BeforeCompile">
Expand Down
Loading