Merge remote-tracking branch 'origin/master' into remove-code-repetition

# Conflicts:
#	Source/Client/AsyncTime/AsyncTimeComp.cs
#	Source/Client/AsyncTime/TimeControlUI.cs
#	Source/Client/Comp/MultiplayerWorldComp.cs

.github/workflows/build-beta.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Setup Dotnet
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
 
     - name: Install Mod Dependencies
       run: dotnet restore ${{ env.SLN_PATH }}
@@ -35,7 +35,7 @@ jobs:
     - run: mkdir -p output/Multiplayer
 
     - name: Move files
-      run: mv About/ Assemblies/ Defs/ Languages/ Textures/ output/Multiplayer
+      run: mv About/ Assemblies/ AssembliesCustom/ Defs/ Languages/ Textures/ output/Multiplayer
 
     - name: Upload Mod Artifacts
       uses: actions/upload-artifact@v2

.github/workflows/build-workshop.yml

@@ -1,6 +1,7 @@
 name: Build workshop
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - 'v*'
@@ -19,7 +20,7 @@ jobs:
     - name: Setup Dotnet
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
 
     - name: Run workshop bundler
       run: ./workshop_bundler.sh

.github/workflows/pr-check.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up .NET
       uses: actions/[email protected]
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
       env:
         DOTNET_NOLOGO: true
         DOTNET_CLI_TELEMETRY_OPTOUT: true

.gitignore

@@ -261,6 +261,7 @@ __pycache__/
 *.pyc
 
 /Assemblies
+/AssembliesCustom
 /Source/Publicise-1.0.0.zip
 /Source/publicise_hash.txt
 /Source/Publicise.exe
@@ -269,4 +270,6 @@ __pycache__/
 /Multiplayer
 Multiplayer*.zip
 
-!Source/Client/Debug/
+!Source/Client/Debug/
+
+/Source/mpdb

About/About.xml

@@ -3,12 +3,12 @@
   <packageId>rwmt.Multiplayer</packageId>
   <name>Multiplayer</name>
   <supportedVersions>
-    <li>1.4</li>
+    <li>1.5</li>
   </supportedVersions>
   <author>RimWorld Multiplayer Team</author>
   <url>https://github.com/rwmt/Multiplayer</url>
-  <description>&lt;color=red&gt;&lt;b&gt;Important: &lt;/b&gt; This mod should be placed right below Core and expansions in the mod list to work properly!
-Requires >= Rimworld v1.4.3555&lt;/color&gt;\n
+  <description>&lt;b&gt;Important: This mod should be placed right below Core and expansions in the mod list to work properly!
+Requires RimWorld >= 1.5.4104&lt;/b&gt;\n
 Multiplayer mod for RimWorld.
 
 FAQ - https://hackmd.io/@rimworldmultiplayer/docs/
@@ -31,5 +31,6 @@ Discord - https://discord.gg/S4bxXpv
   </loadAfter>
   <loadBefore>
     <li>UnlimitedHugs.HugsLib</li>
+    <li>OskarPotocki.VanillaFactionsExpanded.Core</li>
   </loadBefore>
 </ModMetaData>

README.md

@@ -24,7 +24,7 @@ Please do all pull requests to the [development](https://github.com/rwmt/Multipl
 
 If you’re feeling generous these are people who have contributed greatly to the mod’s development and upkeep.
 
-**[Zetrith](https://ko-fi.com/zetrith)** - Creator, Core, Support\
+**[Zetrith](https://patreon.com/zetrith)** - Creator, Core, Support\
 **[NotFood](https://ko-fi.com/notfood)** - Core, Mod Compatiblity, Compatibility Commissions\
 **[Sokyran](https://ko-fi.com/sokyran)** - Core, Mod Compatiblity, Compatibility Commissions\
 [Nebual](https://ko-fi.com/Nebual) - Core\

Source/.dockerignore

@@ -0,0 +1,25 @@
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md