Updated to v1.2.0, updated deps

BUTR · Jul 1, 2023 · 9c7e628 · 9c7e628
1 parent 60f7025
commit 9c7e628
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/build/common.props b/build/common.props
@@ -4,17 +4,17 @@
   <!--Development Variables-->
   <PropertyGroup>
     <IronPythonVersion>3.4.0</IronPythonVersion>
-    <Version>$(IronPythonVersion).2</Version>
+    <Version>$(IronPythonVersion).3</Version>
 
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
-    <HarmonyExtensionsVersion>3.2.0.72</HarmonyExtensionsVersion>
-    <HarmonyAnalyzerVersion>1.0.1.44</HarmonyAnalyzerVersion>
-    <ButterLibVersion>2.6.2</ButterLibVersion>
+    <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>
+    <HarmonyAnalyzerVersion>1.0.1.50</HarmonyAnalyzerVersion>
+    <ButterLibVersion>2.8.1</ButterLibVersion>
     <!--BuildResources Version-->
-    <BuildResourcesVersion>1.0.1.87</BuildResourcesVersion>
-    <BUTRSharedVersion>3.0.0.127</BUTRSharedVersion>
-    <BUTRModuleManagerVersion>5.0.166</BUTRModuleManagerVersion>
+    <BuildResourcesVersion>1.1.0.102</BuildResourcesVersion>
+    <BUTRSharedVersion>3.0.0.136</BUTRSharedVersion>
+    <BUTRModuleManagerVersion>5.0.209</BUTRModuleManagerVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.4.0.3
+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
+* Updated to v1.2.0
+---------------------------------------------------------------------------------------------------
 Version: 3.4.0.2
-Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0
 * Adapted for Release
 * Switched to Python v3.4.0 non beta
 ---------------------------------------------------------------------------------------------------

diff --git a/....Implementation/BUTRLoadingInterceptor.cs → ....Implementation/BLSELoadingInterceptor.cs b/....Implementation/BUTRLoadingInterceptor.cs → ....Implementation/BLSELoadingInterceptor.cs
@@ -16,7 +16,7 @@
 namespace Bannerlord.IronPython.Implementation
 {
     [BLSEInterceptor]
-    public static class BUTRLoadingInterceptor
+    public static class BLSELoadingInterceptor
     {
         private static readonly AccessTools.FieldRef<Module, Dictionary<string, Type>>? LoadedSubModuleTypes =
             AccessTools2.FieldRefAccess<Module, Dictionary<string, Type>>("_loadedSubmoduleTypes");

diff --git a/src/Bannerlord.IronPython.Implementation/Bannerlord.IronPython.Implementation.csproj b/src/Bannerlord.IronPython.Implementation/Bannerlord.IronPython.Implementation.csproj
@@ -30,8 +30,8 @@
     <PackageReference Include="Harmony.Extensions" Version="$(HarmonyExtensionsVersion)" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageReference Include="Bannerlord.ButterLib" Version="$(ButterLibVersion)" PrivateAssets="all" IncludeAssets="compile" />
     <PackageReference Include="IronPython" Version="$(IronPythonVersion)" />
-    <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
-    <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
+    <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Bannerlord.IronPythonExample/Bannerlord.IronPythonExample.msbuildproj b/src/Bannerlord.IronPythonExample/Bannerlord.IronPythonExample.msbuildproj
@@ -1,4 +1,4 @@
-<Project Sdk="Bannerlord.DataModule.Sdk/1.0.1.68">
+<Project Sdk="Bannerlord.DataModule.Sdk/1.1.0.102">
 
   <PropertyGroup>
     <IronPythonVersion>3.4.0</IronPythonVersion>

diff --git a/supported-game-versions.txt b/supported-game-versions.txt
@@ -1,3 +1,9 @@
+v1.2.0
+v1.1.5
+v1.1.4
+v1.1.3
+v1.1.2
+v1.1.1
 v1.1.0
 v1.0.3
 v1.0.2
-Original file line number
+Diff line change
@@ -1,3 +1,9 @@
+    v1.2.0
+    v1.1.5
+    v1.1.4
+    v1.1.3
+    v1.1.2
+    v1.1.1
     v1.1.0
     v1.0.3
     v1.0.2
@@ Expand Down @@