Merge pull request #241 from Aragas/dev

v4.7.6
Aragas · Jun 30, 2022 · fde48d5 · fde48d5
2 parents 0bb10de + 1064656
commit fde48d5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/build/common.props b/build/common.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <GameVersion>1.7.2</GameVersion>
-    <Version>4.7.5</Version>
+    <Version>4.7.6</Version>
     <HarmonyVersion>2.2.1</HarmonyVersion>
     <ButterLibVersion>2.1.5</ButterLibVersion>
     <UIExtenderExVersion>2.2.1</UIExtenderExVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 4.7.6
+Game Versions: e1.7.2,e1.8.0
+* Second workaround for the language issue
+---------------------------------------------------------------------------------------------------
 Version: 4.7.5
 Game Versions: e1.7.2,e1.8.0
 * Workaround for the language issue

diff --git a/...oduleData/Languages/EN/language_data.xml_ → ...oduleData/Languages/EN/language_data._xml b/...oduleData/Languages/EN/language_data.xml_ → ...oduleData/Languages/EN/language_data._xml
diff --git a/src/MCM/MCMSubModule.cs b/src/MCM/MCMSubModule.cs
@@ -60,7 +60,7 @@ protected override void OnSubModuleLoad()
 
             if (!ServiceRegistrationWasCalled)
                 OnServiceRegistration();
-            
+
             if (ApplicationVersionHelper.GameVersion() is { } gameVersion)
             {
                 if (gameVersion.Major is 1 && gameVersion.Minor is 8 && gameVersion.Revision is >= 0)

diff --git a/src/MCM/Utils/LocalizedTextManagerUtils.cs b/src/MCM/Utils/LocalizedTextManagerUtils.cs
@@ -16,7 +16,7 @@ internal static class LocalizedTextManagerUtils
         private delegate XmlDocument? LoadXmlFileDelegate(string path);
         private static readonly LoadXmlFileDelegate? LoadXmlFile =
             AccessTools2.GetDeclaredDelegate<LoadXmlFileDelegate>("TaleWorlds.Localization.LocalizedTextManager:LoadXmlFile");
-        
+
         private delegate void LoadFromXmlDelegate(XmlDocument doc, string modulePath);
         private static readonly LoadFromXmlDelegate? LoadFromXml =
             AccessTools2.GetDeclaredDelegate<LoadFromXmlDelegate>("TaleWorlds.Localization.LanguageData:LoadFromXml");

diff --git a/src/Mod Configuration Menu.sln b/src/Mod Configuration Menu.sln
@@ -23,11 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{6DA59EA7-D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCM.Adapter.ModLibV13.Substitute", "MCM.Adapter.ModLibV13.Substitute\MCM.Adapter.ModLibV13.Substitute.csproj", "{3EF3A7F5-50FC-4B53-925D-6CF42FA58405}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Localization", "_Localization", "{FCD88090-9290-4DEF-8AFE-F84D99D03C4A}"
-	ProjectSection(SolutionItems) = preProject
-		Localization\localization.xsd = Localization\localization.xsd
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{013467E6-5CC6-4899-B549-EC5441CB3AB6}"
 	ProjectSection(SolutionItems) = preProject
 		nuget.config = nuget.config
@@ -265,7 +260,6 @@ Global
 		{8CE0FC50-A411-4502-8737-6DF24C2D69AD} = {013467E6-5CC6-4899-B549-EC5441CB3AB6}
 		{A606EEA7-A2AA-4070-86CE-1B6EF495150E} = {C08D87A6-8ADC-4600-9CA1-2B18F9BDD133}
 		{3EF3A7F5-50FC-4B53-925D-6CF42FA58405} = {C08D87A6-8ADC-4600-9CA1-2B18F9BDD133}
-		{FCD88090-9290-4DEF-8AFE-F84D99D03C4A} = {013467E6-5CC6-4899-B549-EC5441CB3AB6}
 		{013467E6-5CC6-4899-B549-EC5441CB3AB6} = {6DA59EA7-D40B-4C02-B0CC-64875B4064CD}
 		{8A92126A-70CA-47BF-B208-E49E47A9E707} = {6DA59EA7-D40B-4C02-B0CC-64875B4064CD}
 		{01264F42-8EC3-4920-AF18-FB316F5BFB9A} = {6DA59EA7-D40B-4C02-B0CC-64875B4064CD}