Merge pull request #172 from BUTR/dev

Release
BUTR · Feb 4, 2024 · 7e1bd1f · 7e1bd1f
2 parents 353f34d + 4625a12
commit 7e1bd1f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/check-version.yml b/.github/workflows/check-version.yml
@@ -40,7 +40,7 @@ jobs:
 
     - name: Trigger publish
       if: steps.status.outputs.newer_version_status == '0'
-      uses: peter-evans/repository-dispatch@v2
+      uses: peter-evans/repository-dispatch@v3
       with:
         token: ${{secrets.REPO_ACCESS_TOKEN}}
         repository: BUTR/Bannerlord.Harmony

diff --git a/src/Bannerlord.Harmony/Bannerlord.Harmony.csproj b/src/Bannerlord.Harmony/Bannerlord.Harmony.csproj
@@ -38,8 +38,8 @@
   <!--Module Creation-->
 
   <ItemGroup>
-    <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)-prerelease.2" />
-    <PackageReference Include="MonoMod.Core" Version="1.0.1" />
+    <PackageReference Include="Lib.Harmony" Version="$(HarmonyVersion)-prerelease.7" />
+    <PackageReference Include="MonoMod.Core" Version="1.1.0-prerelease.2" />
 
     <PackageReference Include="Bannerlord.BuildResources" Version="$(BuildResourcesVersion)" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Bannerlord.BUTR.Analyzers" Version="$(BUTRAnalyzerVersion)" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />

diff --git a/src/Bannerlord.Harmony/Properties/launchSettings.json b/src/Bannerlord.Harmony/Properties/launchSettings.json
@@ -1,16 +1,29 @@
 {
   "profiles": {
+    "BLSE": {
+      "commandName": "Executable",
+      "executablePath": "$(GameFolder)\\bin\\$(GameConfiguration)\\Bannerlord.BLSE.Standalone.exe",
+      "commandLineArgs": "/enablecrashhandlerwhendebuggerisattached /singleplayer _MODULES_*$(ModuleId)*Native*SandBoxCore*CustomBattle*Sandbox*StoryMode*_MODULES_",
+      "workingDirectory": "$(GameFolder)\\bin\\$(GameConfiguration)"
+    },
+    "BLSEWithMCM": {
+      "commandName": "Executable",
+      "executablePath": "$(GameFolder)\\bin\\$(GameConfiguration)\\Bannerlord.BLSE.Standalone.exe",
+      "commandLineArgs": "/enablecrashhandlerwhendebuggerisattached /singleplayer _MODULES_*$(ModuleId)*Bannerlord.ButterLib*Bannerlord.UIExtenderEx*Bannerlord.MBOptionScreen*Native*SandBoxCore*CustomBattle*Sandbox*StoryMode*_MODULES_",
+      "workingDirectory": "$(GameFolder)\\bin\\$(GameConfiguration)"
+    },
+
     "Bannerlord": {
       "commandName": "Executable",
-      "executablePath": "$(GameFolder)\\bin\\Win64_Shipping_Client\\Bannerlord.exe",
+      "executablePath": "$(GameFolder)\\bin\\$(GameConfiguration)\\Bannerlord.exe",
       "commandLineArgs": "/singleplayer _MODULES_*$(ModuleId)*Native*SandBoxCore*CustomBattle*Sandbox*StoryMode*_MODULES_",
-      "workingDirectory": "$(GameFolder)\\bin\\Win64_Shipping_Client"
+      "workingDirectory": "$(GameFolder)\\bin\\$(GameConfiguration)"
     },
     "BannerlordWithMCM": {
       "commandName": "Executable",
-      "executablePath": "$(GameFolder)\\bin\\Win64_Shipping_Client\\Bannerlord.exe",
+      "executablePath": "$(GameFolder)\\bin\\$(GameConfiguration)\\Bannerlord.exe",
       "commandLineArgs": "/singleplayer _MODULES_*$(ModuleId)*Bannerlord.ButterLib*Bannerlord.UIExtenderEx*Bannerlord.MBOptionScreen*Native*SandBoxCore*CustomBattle*Sandbox*StoryMode*_MODULES_",
-      "workingDirectory": "$(GameFolder)\\bin\\Win64_Shipping_Client"
+      "workingDirectory": "$(GameFolder)\\bin\\$(GameConfiguration)"
     }
   }
 }
diff --git a/src/Bannerlord.Harmony/_Module/ModuleData/Languages/DE/sta_strings.xml b/src/Bannerlord.Harmony/_Module/ModuleData/Languages/DE/sta_strings.xml
@@ -10,5 +10,6 @@
     <string id="Z4d2nSD38a" text="Die Datei Harmony.dll wurde nicht gefunden!"/>
     <string id="ASjx7sqkJs" text="Geladene Harmony.dll Version ist falsch!{NL}Erwartet {P_VERSION}, aber erhielt {E_VERSION}!{EXPECT_ISSUES_WARNING}"/>
     <string id="xTeLdSrXk4" text="Harmony.dll wurde von einem anderen Ort geladen: {LOCATION}!{NL}Es kann durch einen benutzerdefinierten Launcher oder einen anderen Mod verursacht werden!{EXPECT_ISSUES_WARNING}"/>
+    <string id="jhD6BVx78D" text="Die aktuelle Spielversion {GAME_VERSION} wird nicht unterstützt! Bitte aktualisieren Sie Ihr Spiel auf {MIN_GAME_VERSION} oder höher!{EXPECT_ISSUES_WARNING}"/>
   </strings>
 </base>
diff --git a/src/Bannerlord.Harmony/_Module/ModuleData/Languages/JP/sta_strings.xml b/src/Bannerlord.Harmony/_Module/ModuleData/Languages/JP/sta_strings.xml
@@ -10,5 +10,6 @@
     <string id="Z4d2nSD38a" text="読み込まれた 0Harmony.dll のバージョンが違います!{NL} 求められるバージョンは {P_VERSION} ですが, 読み込まれたのは {E_VERSION} です!{EXPECT_ISSUES_WARNING}"/>
     <string id="ASjx7sqkJs" text="0Harmony.dll が他の場所から読み込まれました: {LOCATION}!{NL} カスタムランチャーまたは他のmodによって読み込まれた可能性があります!{EXPECT_ISSUES_WARNING}"/>
     <string id="xTeLdSrXk4" text="{NL}これは推奨されません。不具合の発生が予想されます!{NL} もしゲームがクラッシュしこの警告が表示されているなら, バグレポートをお願いします!"/>
+    <string id="jhD6BVx78D" text="現在のゲームバージョンである{GAME_VERSION}はサポートされていません。{MIN_GAME_VERSION}以降のものに更新してください。{EXPECT_ISSUES_WARNING}"/>
   </strings>
 </base>