Merge branch 'dev' into master

.github/workflows/test-and-publish.yml

@@ -153,8 +153,9 @@ jobs:
         desc="${desc//$'\n'/'%0A'}"
         desc="${desc//$'\r'/'%0D'}"
         echo "::set-output name=mod_description::$desc"
+
     - name: Pack MCM (Release)
-      run: dotnet pack src/MCM.NuGet/MCM.NuGet.csproj --configuration Release -o "./packages";
+      run: dotnet pack src/MCM/MCM.csproj --configuration Release -o "./packages";
       env:
         DOTNET_NOLOGO: 1
         DOTNET_CLI_TELEMETRY_OPTOUT: 1

build/common.props

@@ -1,11 +1,11 @@
 <Project>
 
   <PropertyGroup>
-    <Version>4.0.1</Version>
+    <Version>4.0.2</Version>
     <GameVersion>1.4.3</GameVersion>
-    <ButterLibVersion>0.0.12</ButterLibVersion>
+    <ButterLibVersion>1.0.3</ButterLibVersion>
     <HarmonyVersion>2.0.2</HarmonyVersion>
-    <UIExtenderExVersion>0.0.9</UIExtenderExVersion>
+    <UIExtenderExVersion>1.0.2</UIExtenderExVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>

changelog.txt

@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 4.0.2
+Game Versions: e1.4.3,e1.5.0,e1.5.1
+* Fixed SubModule names
+---------------------------------------------------------------------------------------------------
 Version: 4.0.1
 Game Versions: e1.4.3,e1.5.0,e1.5.1
 * Explicit loading of Implementation and UI sub-modules

src/MCM.NexusMods/_Module/SubModule.xml

@@ -20,13 +20,13 @@
     </SubModule>
     <SubModule>
       <Name value="MCMv4 Implementation"/>
-      <DLLName value="MCMv4.Implementation.v4.0.0.dll"/>
+      <DLLName value="MCMv4.Implementation.v$version$.dll"/>
       <SubModuleClassType value="MCM.Implementation.MCMImplementationSubModule"/>
       <Tags/>
     </SubModule>
     <SubModule>
       <Name value="MCMv4 UI"/>
-      <DLLName value="MCMv4.UI.v4.0.0.dll"/>
+      <DLLName value="MCMv4.UI.v$version$.dll"/>
       <SubModuleClassType value="MCM.UI.MCMUISubModule"/>
       <Tags/>
     </SubModule>

src/MCM/MCM.csproj

@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Authors>Aragas, mipen</Authors>
     <AssemblyName>MCMv4</AssemblyName>
   </PropertyGroup>
 
@@ -11,6 +10,8 @@
     <PackageId>Bannerlord.MCM</PackageId>
     <PackageDescription>A library for easy Setting integration. Contains the abstraction library, requires the Standalone dependency to work!</PackageDescription>
     <Title>Mod Configuration Menu</Title>
+    <Authors>Aragas, mipen</Authors>
+    <DevelopmentDependency>true</DevelopmentDependency>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>MCM-128-w-2.png</PackageIcon>

src/Mod Configuration Menu.sln

@@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModLib.Definitions Substitu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ModLib", "ModLib", "{8D3F0DEE-9836-4B89-A258-EC65C09837BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCM.NuGet", "MCM.NuGet\MCM.NuGet.csproj", "{733451EC-8556-4FC2-8429-31770126D071}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Localization", "_Localization", "{FCD88090-9290-4DEF-8AFE-F84D99D03C4A}"
 	ProjectSection(SolutionItems) = preProject
 		Localization\localization.xsd = Localization\localization.xsd
@@ -63,6 +61,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MCMv3", "MCMv3", "{698918F1
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MCM.Implementation.MCMv3", "MCM.Implementation.MCMv3\MCM.Implementation.MCMv3.csproj", "{94DECE01-AE9B-476C-82BE-0DE680E38FA2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{01264F42-8EC3-4920-AF18-FB316F5BFB9A}"
+	ProjectSection(SolutionItems) = preProject
+		..\.github\workflows\docfx.yml = ..\.github\workflows\docfx.yml
+		..\.github\workflows\nexusmods-cookies.yml = ..\.github\workflows\nexusmods-cookies.yml
+		..\.github\workflows\test-and-publish.yml = ..\.github\workflows\test-and-publish.yml
+		..\.github\workflows\test.yml = ..\.github\workflows\test.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,10 +103,6 @@ Global
 		{3EF3A7F5-50FC-4B53-925D-6CF42FA58405}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EF3A7F5-50FC-4B53-925D-6CF42FA58405}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3EF3A7F5-50FC-4B53-925D-6CF42FA58405}.Release|Any CPU.Build.0 = Release|Any CPU
-		{733451EC-8556-4FC2-8429-31770126D071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{733451EC-8556-4FC2-8429-31770126D071}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{733451EC-8556-4FC2-8429-31770126D071}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{733451EC-8556-4FC2-8429-31770126D071}.Release|Any CPU.Build.0 = Release|Any CPU
 		{93218C18-364B-4ADA-8878-65A0D4F6F589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{93218C18-364B-4ADA-8878-65A0D4F6F589}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93218C18-364B-4ADA-8878-65A0D4F6F589}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -131,7 +133,6 @@ Global
 		{A606EEA7-A2AA-4070-86CE-1B6EF495150E} = {8D3F0DEE-9836-4B89-A258-EC65C09837BC}
 		{3EF3A7F5-50FC-4B53-925D-6CF42FA58405} = {8D3F0DEE-9836-4B89-A258-EC65C09837BC}
 		{8D3F0DEE-9836-4B89-A258-EC65C09837BC} = {013467E6-5CC6-4899-B549-EC5441CB3AB6}
-		{733451EC-8556-4FC2-8429-31770126D071} = {8CE0FC50-A411-4502-8737-6DF24C2D69AD}
 		{FCD88090-9290-4DEF-8AFE-F84D99D03C4A} = {013467E6-5CC6-4899-B549-EC5441CB3AB6}
 		{93218C18-364B-4ADA-8878-65A0D4F6F589} = {87102D65-63F1-4A21-A218-C6D2F260BCE4}
 		{87102D65-63F1-4A21-A218-C6D2F260BCE4} = {013467E6-5CC6-4899-B549-EC5441CB3AB6}
@@ -141,6 +142,7 @@ Global
 		{8A92126A-70CA-47BF-B208-E49E47A9E707} = {6DA59EA7-D40B-4C02-B0CC-64875B4064CD}
 		{698918F1-18D4-4E5F-849A-3C81B724EC28} = {013467E6-5CC6-4899-B549-EC5441CB3AB6}
 		{94DECE01-AE9B-476C-82BE-0DE680E38FA2} = {698918F1-18D4-4E5F-849A-3C81B724EC28}
+		{01264F42-8EC3-4920-AF18-FB316F5BFB9A} = {6DA59EA7-D40B-4C02-B0CC-64875B4064CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FF6EB7D0-C9CB-4A8B-AE72-0511907E6821}