Makefile: Fail target version when not a git repository

Fail Situation Critical if Volkov is killed before entering the world.
Fix non-relative path handling in install logic.
2021-03-13 15:58:11 +00:00 · 2021-03-13 15:55:39 +00:00 · 2021-03-13 15:52:52 +00:00 · 2021-03-05 18:56:46 +01:00 · 2021-03-05 18:36:08 +01:00 · 2021-02-28 12:29:27 +00:00
253 changed files with 3561 additions and 2238 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,6 +18,7 @@ jobs:
        run: |
          mono --version
          make check
+          mono ~/.nuget/packages/nunit.consolerunner/3.11.1/tools/nunit3-console.exe --noresult bin/OpenRA.Test.dll

      - name: Check Mods
        run: |
@@ -26,26 +27,19 @@ jobs:
          make test

  windows:
-    name: Windows (Net 5.0)
+    name: Windows (Framework 4.7)
    runs-on: windows-2019

    steps:
      - name: Clone Repository
        uses: actions/checkout@v2

-      - name: Install .NET 5
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '5.0.x'
-
      - name: Check Code
        shell: powershell
        run: |
-          # Work around runtime failures on the GH Actions runner
          dotnet nuget locals all --clear
          .\make.ps1 check
-          dotnet build OpenRA.Test\OpenRA.Test.csproj -c Debug --nologo -p:TargetPlatform=win-x64
-          dotnet test bin\OpenRA.Test.dll --test-adapter-path:.
+          Invoke-Expression "$home\.nuget\packages\nunit.consolerunner\3.11.1\tools\nunit3-console.exe --noresult bin/OpenRA.Test.dll"

      - name: Check Mods
        run: |
--- a/.github/workflows/itch.yml
+++ b/.github/workflows/itch.yml
@@ -15,17 +15,15 @@ jobs:
    if: github.repository == 'openra/openra'
    steps:
      - name: Download Packages
-        env:
-          GIT_TAG: ${{ github.event.inputs.tag }}
        run: |
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${GIT_TAG}/OpenRA-${GIT_TAG}-x64.exe"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${GIT_TAG}/OpenRA-${GIT_TAG}-x64-winportable.zip" -O "OpenRA-${GIT_TAG}-x64-win-itch.zip"
-          wget -q "https://github.com${{ github.repository }}/releases/download/${GIT_TAG}/OpenRA-${GIT_TAG}.dmg"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${GIT_TAG}/OpenRA-Dune-2000-x86_64.AppImage"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${GIT_TAG}/OpenRA-Red-Alert-x86_64.AppImage"
-          wget -q "https://github.com/${{ github.repository }}/releases/download/${GIT_TAG}/OpenRA-Tiberian-Dawn-x86_64.AppImage"
-          wget -q "https://raw.githubusercontent.com/${{ github.repository }}/${GIT_TAG}/packaging/.itch.toml"
-          zip -u "OpenRA-${GIT_TAG}-x64-win-itch.zip" .itch.toml
+          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-${{ github.event.inputs.tag }}-x64.exe"
+          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-${{ github.event.inputs.tag }}-x64-winportable.zip" -O "OpenRA-${{ github.event.inputs.tag }}-x64-win-itch.zip"
+          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-${{ github.event.inputs.tag }}.dmg"
+          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Dune-2000-x86_64.AppImage"
+          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Red-Alert-x86_64.AppImage"
+          wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Tiberian-Dawn-x86_64.AppImage"
+          wget -q "https://raw.githubusercontent.com/${{ github.repository }}/${{ github.event.inputs.tag }}/packaging/.itch.toml"
+          zip -u "OpenRA-${{ github.event.inputs.tag }}-x64-win-itch.zip" .itch.toml

      - name: Publish Windows Installer
        uses: josephbmanley/butler-publish-itchio-action@master
@@ -35,7 +33,7 @@ jobs:
          ITCH_GAME: openra
          ITCH_USER: openra-developers
          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-${{ github.event.inputs.tag }}}-x64.exe"
+          PACKAGE: OpenRA-${{ github.event.inputs.tag }}}-x64.exe

      - name: Publish Windows Itch Bundle
        uses: josephbmanley/butler-publish-itchio-action@master
@@ -55,7 +53,7 @@ jobs:
          ITCH_GAME: openra
          ITCH_USER: openra-developers
          VERSION: ${{ github.event.inputs.tag }}
-          PACKAGE: OpenRA-${{ github.event.inputs.tag }}}.dmg"
+          PACKAGE: OpenRA-${{ github.event.inputs.tag }}}.dmg

      - name: Publish RA AppImage
        uses: josephbmanley/butler-publish-itchio-action@master
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -8,6 +8,30 @@ on:
    - 'devtest-*'

 jobs:
+  source:
+    name: Source Tarball
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v2
+
+      - name: Prepare Environment
+        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
+
+      - name: Package Source
+        run: |
+          mkdir -p build/source
+          ./packaging/source/buildpackage.sh "${GIT_TAG}" "${PWD}/build/source"
+
+      - name: Upload Packages
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref }}
+          overwrite: true
+          file_glob: true
+          file: build/source/*
+
  linux:
    name: Linux AppImages
    runs-on: ubuntu-20.04
@@ -39,11 +63,6 @@ jobs:
      - name: Clone Repository
        uses: actions/checkout@v2

-      - name: Install .NET 5
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '5.0.x'
-
      - name: Prepare Environment
        run: echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}

@@ -74,15 +93,11 @@ jobs:
      - name: Clone Repository
        uses: actions/checkout@v2

-      - name: Install .NET 5
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '5.0.x'
-
      - name: Prepare Environment
        run: |
          echo "GIT_TAG=${GITHUB_REF#refs/tags/}" >> ${GITHUB_ENV}
-          sudo apt install nsis wine64
+          sudo apt-get update
+          sudo apt-get install nsis

      - name: Package Installers
        run: |
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -8,16 +8,18 @@ Windows

 Compiling OpenRA requires the following dependencies:
 * [Windows PowerShell >= 4.0](http://microsoft.com/powershell) (included by default in recent Windows 10 versions)
-* [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0) (or via Visual Studio)
+* [.NET Framework 4.7.2 (Developer Pack)](https://dotnet.microsoft.com/download/dotnet-framework/net472) (or via Visual Studio 2017)
+* [.NET Core 2.2 SDK](https://dotnet.microsoft.com/download/dotnet-core/2.2) (or via Visual Studio 2017)

-To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with `dotnet` or use the Makefile analogue command `make all` scripted in PowerShell syntax.
+
+To compile OpenRA, open the `OpenRA.sln` solution in the main folder, build it from the command-line with MSBuild or use the Makefile analogue command `make all` scripted in PowerShell syntax.

 Run the game with `launch-game.cmd`. It can be handed arguments that specify the exact mod one wishes to run, for example, run `launch-game.cmd Game.Mod=ra` to launch Red Alert, `launch-game.cmd Game.Mod=cnc` to start Tiberian dawn or `launch-game.cmd Game.Mod=d2k` to launch Dune 2000.

 Linux
 =====

-Mono, version 6.4 or later, is required to compile OpenRA. You can add the [upstream mono repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version if your system packages are not sufficient.
+Mono, version 5.18 or later, is required to compile OpenRA. You can add the [upstream mono repository](https://www.mono-project.com/download/stable/#download-lin) for your distro to obtain the latest version if your system packages are not sufficient.

 To compile OpenRA, run `make` from the command line. After this one can run the game with `./launch-game.sh`. It is also possible to specify the mod you wish to run from the command line, e.g. with `./launch-game.sh Game.Mod=ts` if you wish to try the experimental Tiberian Sun mod.

@@ -97,7 +99,7 @@ macOS
 =====

 Before compiling OpenRA you must install the following dependencies:
-* [Mono >= 6.4](https://www.mono-project.com/download/stable/#download-mac)
+* [Mono >= 5.18](https://www.mono-project.com/download/stable/#download-mac)

 To compile OpenRA, run `make` from the command line. Run with `./launch-game.sh`.

--- a/58
+++ b/58
@@ -15,6 +15,10 @@
 # to compile and install Red Alert, Tiberian Dawn, and Dune 2000, run:
 #   make [prefix=/foo] [bindir=/bar/bin] install
 #
+# to compile and install Red Alert, Tiberian Dawn, and Dune 2000
+# using system libraries for native dependencies, run:
+#   make [prefix=/foo] [bindir=/bar/bin] TARGETPLATFORM=unix-generic install
+#
 # to install Linux startup scripts, desktop files, icons, and MIME metadata
 #   make install-linux-shortcuts
 #
@@ -25,6 +29,18 @@
 #   make help
 #

+############################## TOOLCHAIN ###############################
+#
+# List of .NET assemblies that we can guarantee exist
+WHITELISTED_OPENRA_ASSEMBLIES = OpenRA.exe OpenRA.Utility.exe OpenRA.Server.exe OpenRA.Platforms.Default.dll OpenRA.Game.dll OpenRA.Mods.Common.dll OpenRA.Mods.Cnc.dll OpenRA.Mods.D2k.dll
+
+# These are explicitly shipped alongside our core files by the packaging script
+WHITELISTED_THIRDPARTY_ASSEMBLIES = ICSharpCode.SharpZipLib.dll FuzzyLogicLibrary.dll Eluant.dll BeaconLib.dll Open.Nat.dll SDL2-CS.dll OpenAL-CS.Core.dll DiscordRPC.dll Newtonsoft.Json.dll
+
+# These are shipped in our custom minimal mono runtime and also available in the full system-installed .NET/mono stack
+# This list *must* be kept in sync with the files packaged by the AppImageSupport and OpenRALauncherOSX repositories
+WHITELISTED_CORE_ASSEMBLIES = mscorlib.dll System.dll System.Configuration.dll System.Core.dll System.Numerics.dll System.Security.dll System.Xml.dll Mono.Security.dll netstandard.dll
+
 ######################### UTILITIES/SETTINGS ###########################
 #
 # Install locations for local installs and downstream packaging
@@ -36,10 +52,6 @@ bindir ?= $(prefix)/bin
 libdir ?= $(prefix)/lib
 gameinstalldir ?= $(libdir)/openra

-BIN_INSTALL_DIR = $(DESTDIR)$(bindir)
-DATA_INSTALL_DIR = $(DESTDIR)$(datadir)
-OPENRA_INSTALL_DIR = $(DESTDIR)$(gameinstalldir)
-
 # Toolchain
 CWD = $(shell pwd)
 MSBUILD = msbuild -verbosity:m -nologo
@@ -49,7 +61,8 @@ RM_R = $(RM) -r
 RM_F = $(RM) -f
 RM_RF = $(RM) -rf

-VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
+# Only for use in target version:
+VERSION := $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || (c=$$(git rev-parse --short HEAD 2>/dev/null) && echo git-$$c))

 # Detect target platform for dependencies if not given by the user
 ifndef TARGETPLATFORM
@@ -66,13 +79,13 @@ endif
 endif
 endif

-OPENRA_UTILITY = ENGINE_DIR=".." $(MONO) --debug bin/OpenRA.Utility.dll
+OPENRA_UTILITY = ENGINE_DIR=".." $(MONO) --debug bin/OpenRA.Utility.exe

 ##################### DEVELOPMENT BUILDS AND TESTS #####################
 #
 all:
 	@command -v $(firstword $(MSBUILD)) >/dev/null || (echo "OpenRA requires the '$(MSBUILD)' tool provided by Mono >= 5.18."; exit 1)
-	@$(MSBUILD) -t:Build -restore -p:Configuration=Release -p:TargetPlatform=$(TARGETPLATFORM) -p:Mono=true -p:DefineConstants="MONO"
+	@$(MSBUILD) -t:Build -restore -p:Configuration=Release -p:TargetPlatform=$(TARGETPLATFORM)
 ifeq ($(TARGETPLATFORM), unix-generic)
 	@./configure-system-libraries.sh
 endif
@@ -80,13 +93,19 @@ endif

 clean:
 	@-$(RM_RF) ./bin ./*/bin ./*/obj
-	@$(MSBUILD) -t:Clean -p:Mono=true
+	@$(MSBUILD) -t:Clean
 	@-$(RM_F) IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP

 check:
 	@echo
 	@echo "Compiling in debug mode..."
-	@$(MSBUILD) -t:build -restore -p:Configuration=Debug -p:TargetPlatform=$(TARGETPLATFORM) -p:Mono=true -p:DefineConstants="MONO"
+	@$(MSBUILD) -t:build -restore -p:Configuration=Debug -p:TargetPlatform=$(TARGETPLATFORM)
+ifeq ($(TARGETPLATFORM), unix-generic)
+	@./configure-system-libraries.sh
+endif
+	@echo
+	@echo "Checking runtime assemblies..."
+	@$(OPENRA_UTILITY) all --check-runtime-assemblies $(WHITELISTED_OPENRA_ASSEMBLIES) $(WHITELISTED_THIRDPARTY_ASSEMBLIES) $(WHITELISTED_CORE_ASSEMBLIES)
 	@echo
 	@echo "Checking for explicit interface violations..."
 	@$(OPENRA_UTILITY) all --check-explicit-interfaces
@@ -118,18 +137,21 @@ test: all
 ############# LOCAL INSTALLATION AND DOWNSTREAM PACKAGING ##############
 #
 version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml
-	@sh -c '. ./packaging/functions.sh; set_engine_version $(VERSION) .'
-	@sh -c '. ./packaging/functions.sh; set_mod_version $(VERSION) mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml'
+ifeq ($(VERSION),)
+	$(error Unable to determine new version (requires git or override of variable VERSION))
+endif
+	@sh -c '. ./packaging/functions.sh; set_engine_version "$(VERSION)" .'
+	@sh -c '. ./packaging/functions.sh; set_mod_version "$(VERSION)" mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml'

 install:
-	@sh -c '. ./packaging/functions.sh; install_assemblies_mono $(CWD) $(OPENRA_INSTALL_DIR) $(TARGETPLATFORM) True True True'
-	@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(OPENRA_INSTALL_DIR) cnc d2k ra'
+	@sh -c '. ./packaging/functions.sh; install_assemblies_mono $(CWD) $(DESTDIR)$(gameinstalldir) $(TARGETPLATFORM) True True True'
+	@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(DESTDIR)$(gameinstalldir) cnc d2k ra'

 install-linux-shortcuts:
-	@sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) $(OPENRA_INSTALL_DIR) $(BIN_INSTALL_DIR) $(DATA_INSTALL_DIR) $(VERSION) cnc d2k ra'
+	@sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" "$(shell head -n1 VERSION)" cnc d2k ra'

 install-linux-appdata:
-	@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) $(DATA_INSTALL_DIR) cnc d2k ra'
+	@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) "$(DESTDIR)" "$(datadir)" cnc d2k ra'

 help:
 	@echo 'to compile, run:'
@@ -145,7 +167,11 @@ help:
 	@echo '  make test'
 	@echo
 	@echo 'to compile and install Red Alert, Tiberian Dawn, and Dune 2000 run:'
-	@echo '  make [prefix=/foo] install'
+	@echo '  make [prefix=/foo] [TARGETPLATFORM=unix-generic] install'
+	@echo
+	@echo 'to compile and install Red Alert, Tiberian Dawn, and Dune 2000'
+	@echo 'using system libraries for native dependencies, run:'
+	@echo '   make [prefix=/foo] [bindir=/bar/bin] TARGETPLATFORM=unix-generic install'
 	@echo
 	@echo 'to install Linux startup scripts, desktop files, icons, and MIME metadata'
 	@echo '  make install-linux-shortcuts'
--- a/OpenRA.Game/Activities/Activity.cs
+++ b/OpenRA.Game/Activities/Activity.cs
@@ -74,7 +74,7 @@ namespace OpenRA.Activities
 			// drop valid activities queued after it. Walk the queue until we find a valid activity or
 			// (more likely) run out of activities.
 			while (first != null && first.State == ActivityState.Done)
-				first = first.nextActivity;
+				first = first.NextActivity;

 			return first;
 		}
@@ -120,8 +120,7 @@ namespace OpenRA.Activities
 				lastRun = Tick(self);

 			// Avoid a single tick delay if the childactivity was just queued.
-			var ca = ChildActivity;
-			if (ca != null && ca.State == ActivityState.Queued)
+			if (ChildActivity != null && ChildActivity.State == ActivityState.Queued)
 			{
 				if (ChildHasPriority)
 					lastRun = TickChild(self) && finishing;
@@ -207,18 +206,18 @@ namespace OpenRA.Activities

 		public void Queue(Activity activity)
 		{
-			var it = this;
-			while (it.nextActivity != null)
-				it = it.nextActivity;
-			it.nextActivity = activity;
+			if (NextActivity != null)
+				NextActivity.Queue(activity);
+			else
+				NextActivity = activity;
 		}

 		public void QueueChild(Activity activity)
 		{
-			if (childActivity != null)
-				childActivity.Queue(activity);
+			if (ChildActivity != null)
+				ChildActivity.Queue(activity);
 			else
-				childActivity = activity;
+				ChildActivity = activity;
 		}

 		/// <summary>
@@ -270,21 +269,15 @@ namespace OpenRA.Activities

 		public IEnumerable<T> ActivitiesImplementing<T>(bool includeChildren = true) where T : IActivityInterface
 		{
-			// Skips Done child and next activities
-			if (includeChildren)
-			{
-				var ca = ChildActivity;
-				if (ca != null)
-					foreach (var a in ca.ActivitiesImplementing<T>())
-						yield return a;
-			}
+			if (includeChildren && ChildActivity != null)
+				foreach (var a in ChildActivity.ActivitiesImplementing<T>())
+					yield return a;

 			if (this is T)
 				yield return (T)(object)this;

-			var na = NextActivity;
-			if (na != null)
-				foreach (var a in na.ActivitiesImplementing<T>())
+			if (NextActivity != null)
+				foreach (var a in NextActivity.ActivitiesImplementing<T>())
 					yield return a;
 		}
 	}
--- a/OpenRA.Game/FieldLoader.cs
+++ b/OpenRA.Game/FieldLoader.cs
@@ -66,11 +66,17 @@ namespace OpenRA

 		static readonly ConcurrentCache<Type, FieldLoadInfo[]> TypeLoadInfo =
 			new ConcurrentCache<Type, FieldLoadInfo[]>(BuildTypeLoadInfo);
+		static readonly ConcurrentCache<MemberInfo, bool> MemberHasTranslateAttribute =
+			new ConcurrentCache<MemberInfo, bool>(member => member.HasAttribute<TranslateAttribute>());
+
 		static readonly ConcurrentCache<string, BooleanExpression> BooleanExpressionCache =
 			new ConcurrentCache<string, BooleanExpression>(expression => new BooleanExpression(expression));
 		static readonly ConcurrentCache<string, IntegerExpression> IntegerExpressionCache =
 			new ConcurrentCache<string, IntegerExpression>(expression => new IntegerExpression(expression));

+		static readonly object TranslationsLock = new object();
+		static Dictionary<string, string> translations;
+
 		public static void Load(object self, MiniYaml my)
 		{
 			var loadInfo = TypeLoadInfo[self.GetType()];
@@ -207,7 +213,11 @@ namespace OpenRA
 				return InvalidValueAction(value, fieldType, fieldName);
 			}
 			else if (fieldType == typeof(string))
+			{
+				if (field != null && MemberHasTranslateAttribute[field] && value != null)
+					return Regex.Replace(value, "@[^@]+@", m => Translate(m.Value.Substring(1, m.Value.Length - 2)), RegexOptions.Compiled);
 				return value;
+			}
 			else if (fieldType == typeof(Color))
 			{
 				if (value != null && Color.TryParse(value, out var color))
@@ -684,8 +694,34 @@ namespace OpenRA
 				return null;
 			}
 		}
+
+		public static string Translate(string key)
+		{
+			if (string.IsNullOrEmpty(key))
+				return key;
+
+			lock (TranslationsLock)
+			{
+				if (translations == null)
+					return key;
+
+				if (!translations.TryGetValue(key, out var value))
+					return key;
+
+				return value;
+			}
+		}
+
+		public static void SetTranslations(IDictionary<string, string> translations)
+		{
+			lock (TranslationsLock)
+				FieldLoader.translations = new Dictionary<string, string>(translations);
+		}
 	}

+	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+	public sealed class TranslateAttribute : Attribute { }
+
 	[AttributeUsage(AttributeTargets.Field)]
 	public sealed class FieldFromYamlKeyAttribute : FieldLoader.SerializeAttribute
 	{
--- a/OpenRA.Game/FileFormats/Png.cs
+++ b/OpenRA.Game/FileFormats/Png.cs
@@ -17,7 +17,6 @@ using System.Net;
 using System.Text;
 using ICSharpCode.SharpZipLib.Checksum;
 using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
-using OpenRA.Graphics;
 using OpenRA.Primitives;

 namespace OpenRA.FileFormats
@@ -26,15 +25,12 @@ namespace OpenRA.FileFormats
 	{
 		static readonly byte[] Signature = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };

-		public int Width { get; private set; }
-		public int Height { get; private set; }
-		public Color[] Palette { get; private set; }
-		public byte[] Data { get; private set; }
-		public SpriteFrameType Type { get; private set; }
+		public int Width { get; set; }
+		public int Height { get; set; }
+		public Color[] Palette { get; set; }
+		public byte[] Data { get; set; }
 		public Dictionary<string, string> EmbeddedData = new Dictionary<string, string>();

-		public int PixelStride { get { return Type == SpriteFrameType.Indexed8 ? 1 : Type == SpriteFrameType.Rgb24 ? 3 : 4; } }
-
 		public Png(Stream s)
 		{
 			if (!Verify(s))
@@ -42,8 +38,9 @@ namespace OpenRA.FileFormats

 			s.Position += 8;
 			var headerParsed = false;
+			var isPaletted = false;
+			var is24Bit = false;
 			var data = new List<byte>();
-			Type = SpriteFrameType.Rgba32;

 			while (true)
 			{
@@ -68,12 +65,14 @@ namespace OpenRA.FileFormats

 							var bitDepth = ms.ReadUInt8();
 							var colorType = (PngColorType)ms.ReadByte();
-							if (IsPaletted(bitDepth, colorType))
-								Type = SpriteFrameType.Indexed8;
-							else if (colorType == PngColorType.Color)
-								Type = SpriteFrameType.Rgb24;
+							isPaletted = IsPaletted(bitDepth, colorType);
+							is24Bit = colorType == PngColorType.Color;

-							Data = new byte[Width * Height * PixelStride];
+							var dataLength = Width * Height;
+							if (!isPaletted)
+								dataLength *= 4;
+
+							Data = new byte[dataLength];

 							var compression = ms.ReadByte();
 							/*var filter = */ms.ReadByte();
@@ -134,28 +133,39 @@ namespace OpenRA.FileFormats
 							{
 								using (var ds = new InflaterInputStream(ns))
 								{
-									var pxStride = PixelStride;
-									var rowStride = Width * pxStride;
+									var pxStride = isPaletted ? 1 : is24Bit ? 3 : 4;
+									var srcStride = Width * pxStride;
+									var destStride = Width * (isPaletted ? 1 : 4);

-									var prevLine = new byte[rowStride];
+									var prevLine = new byte[srcStride];
 									for (var y = 0; y < Height; y++)
 									{
 										var filter = (PngFilter)ds.ReadByte();
-										var line = ds.ReadBytes(rowStride);
+										var line = ds.ReadBytes(srcStride);

-										for (var i = 0; i < rowStride; i++)
+										for (var i = 0; i < srcStride; i++)
 											line[i] = i < pxStride
 												? UnapplyFilter(filter, line[i], 0, prevLine[i], 0)
 												: UnapplyFilter(filter, line[i], line[i - pxStride], prevLine[i], prevLine[i - pxStride]);

-										Array.Copy(line, 0, Data, y * rowStride, rowStride);
+										if (is24Bit)
+										{
+											// Fold alpha channel into RGB data
+											for (var i = 0; i < line.Length / 3; i++)
+											{
+												Array.Copy(line, 3 * i, Data, y * destStride + 4 * i, 3);
+												Data[y * destStride + 4 * i + 3] = 255;
+											}
+										}
+										else
+											Array.Copy(line, 0, Data, y * destStride, line.Length);

 										prevLine = line;
 									}
 								}
 							}

-							if (Type == SpriteFrameType.Indexed8 && Palette == null)
+							if (isPaletted && Palette == null)
 								throw new InvalidDataException("Non-Palette indexed PNG are not supported.");

 							return;
@@ -165,7 +175,7 @@ namespace OpenRA.FileFormats
 			}
 		}

-		public Png(byte[] data, SpriteFrameType type, int width, int height, Color[] palette = null,
+		public Png(byte[] data, int width, int height, Color[] palette = null,
 			Dictionary<string, string> embeddedData = null)
 		{
 			var expectLength = width * height;
@@ -175,46 +185,11 @@ namespace OpenRA.FileFormats
 			if (data.Length != expectLength)
 				throw new InvalidDataException("Input data does not match expected length");

-			Type = type;
 			Width = width;
 			Height = height;

-			switch (type)
-			{
-				case SpriteFrameType.Indexed8:
-				case SpriteFrameType.Rgba32:
-				case SpriteFrameType.Rgb24:
-				{
-					// Data is already in a compatible format
-					Data = data;
-					if (type == SpriteFrameType.Indexed8)
-						Palette = palette;
-
-					break;
-				}
-
-				case SpriteFrameType.Bgra32:
-				case SpriteFrameType.Bgr24:
-				{
-					// Convert to big endian
-					Data = new byte[data.Length];
-					var stride = PixelStride;
-					for (var i = 0; i < width * height; i++)
-					{
-						Data[stride * i] = data[stride * i + 2];
-						Data[stride * i + 1] = data[stride * i + 1];
-						Data[stride * i + 2] = data[stride * i + 0];
-
-						if (type == SpriteFrameType.Bgra32)
-							Data[stride * i + 3] = data[stride * i + 3];
-					}
-
-					break;
-				}
-
-				default:
-					throw new InvalidDataException("Unhandled SpriteFrameType {0}".F(type));
-			}
+			Palette = palette;
+			Data = data;

 			if (embeddedData != null)
 				EmbeddedData = embeddedData;
@@ -299,8 +274,9 @@ namespace OpenRA.FileFormats
 					header.Write(IPAddress.HostToNetworkOrder(Height));
 					header.WriteByte(8); // Bit depth

-					var colorType = Type == SpriteFrameType.Indexed8 ? PngColorType.Indexed | PngColorType.Color :
-						Type == SpriteFrameType.Rgb24 ? PngColorType.Color : PngColorType.Color | PngColorType.Alpha;
+					var colorType = Palette != null
+						? PngColorType.Indexed | PngColorType.Color
+						: PngColorType.Color | PngColorType.Alpha;
 					header.WriteByte((byte)colorType);

 					header.WriteByte(0); // Compression
@@ -310,7 +286,7 @@ namespace OpenRA.FileFormats
 					WritePngChunk(output, "IHDR", header);
 				}

-				var alphaPalette = false;
+				bool alphaPalette = false;
 				if (Palette != null)
 				{
 					using (var palette = new MemoryStream())
@@ -342,12 +318,12 @@ namespace OpenRA.FileFormats
 				{
 					using (var compressed = new DeflaterOutputStream(data))
 					{
-						var rowStride = Width * PixelStride;
+						var stride = Width * (Palette != null ? 1 : 4);
 						for (var y = 0; y < Height; y++)
 						{
 							// Write uncompressed scanlines for simplicity
 							compressed.WriteByte(0);
-							compressed.Write(Data, y * rowStride, rowStride);
+							compressed.Write(Data, y * stride, stride);
 						}

 						compressed.Flush();
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -297,7 +297,6 @@ namespace OpenRA
 				EngineVersion = "Unknown";

 			Console.WriteLine("Engine version is {0}", EngineVersion);
-			Console.WriteLine("Runtime: {0}", Platform.RuntimeVersion);

 			// Special case handling of Game.Mod argument: if it matches a real filesystem path
 			// then we use this to override the mod search path, and replace it with the mod id
@@ -330,16 +329,9 @@ namespace OpenRA
 				try
 				{
 					var rendererPath = Path.Combine(Platform.BinDir, "OpenRA.Platforms." + p + ".dll");
-
-#if !MONO
-					var loader = new AssemblyLoader(rendererPath);
-					var platformType = loader.LoadDefaultAssembly().GetTypes().SingleOrDefault(t => typeof(IPlatform).IsAssignableFrom(t));
-
-#else
 					var assembly = Assembly.LoadFile(rendererPath);
-					var platformType = assembly.GetTypes().SingleOrDefault(t => typeof(IPlatform).IsAssignableFrom(t));
-#endif

+					var platformType = assembly.GetTypes().SingleOrDefault(t => typeof(IPlatform).IsAssignableFrom(t));
 					if (platformType == null)
 						throw new InvalidOperationException("Platform dll must include exactly one IPlatform implementation.");

@@ -484,8 +476,6 @@ namespace OpenRA

 			ChromeMetrics.TryGet("ChatMessageColor", out chatMessageColor);
 			ChromeMetrics.TryGet("SystemMessageColor", out systemMessageColor);
-			if (!ChromeMetrics.TryGet("SystemMessageLabel", out systemMessageLabel))
-				systemMessageLabel = "Battlefield Control";

 			ModData.LoadScreen.StartGame(args);
 		}
@@ -555,8 +545,6 @@ namespace OpenRA
 		static volatile ActionQueue delayedActions = new ActionQueue();
 		static Color systemMessageColor = Color.White;
 		static Color chatMessageColor = Color.White;
-		static string systemMessageLabel;
-
 		public static void RunAfterTick(Action a) { delayedActions.Add(a, RunTime); }
 		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, RunTime + delayMilliseconds); }

@@ -888,7 +876,7 @@ namespace OpenRA

 		public static void AddSystemLine(string text)
 		{
-			AddSystemLine(systemMessageLabel, text);
+			AddSystemLine("Battlefield Control", text);
 		}

 		public static void AddSystemLine(string name, string text)
--- a/OpenRA.Game/GameInformation.cs
+++ b/OpenRA.Game/GameInformation.cs
@@ -123,6 +123,7 @@ namespace OpenRA
 				DisplayFactionId = runtimePlayer.DisplayFaction.InternalName,
 				Color = runtimePlayer.Color,
 				Team = client.Team,
+				Handicap = client.Handicap,
 				SpawnPoint = runtimePlayer.SpawnPoint,
 				IsRandomFaction = runtimePlayer.Faction.InternalName != client.Faction,
 				IsRandomSpawnPoint = runtimePlayer.DisplaySpawnPoint == 0,
@@ -166,6 +167,7 @@ namespace OpenRA
 			/// <summary>The team ID on start-up, or 0 if the player is not part of a team.</summary>
 			public int Team;
 			public int SpawnPoint;
+			public int Handicap;

 			/// <summary>True if the faction was chosen at random; otherwise, false.</summary>
 			public bool IsRandomFaction;
--- a/OpenRA.Game/GameSpeed.cs
+++ b/OpenRA.Game/GameSpeed.cs
@@ -15,6 +15,7 @@ namespace OpenRA
 {
 	public class GameSpeed
 	{
+		[Translate]
 		public readonly string Name = "Default";
 		public readonly int Timestep = 40;
 		public readonly int OrderLatency = 3;
--- a/OpenRA.Game/Graphics/CursorManager.cs
+++ b/OpenRA.Game/Graphics/CursorManager.cs
@@ -69,16 +69,9 @@ namespace OpenRA.Graphics
 					// Hotspot is specified relative to the center of the frame
 					var hotspot = f.Offset.ToInt2() - kv.Value.Hotspot - new int2(f.Size) / 2;

-					// Resolve indexed data to real colours
-					var data = f.Data;
-					var type = f.Type;
-					if (type == SpriteFrameType.Indexed8)
-					{
-						data = ConvertIndexedToBgra(kv.Key, f, palette);
-						type = SpriteFrameType.Bgra32;
-					}
-
-					c.Sprites[c.Length++] = sheetBuilder.Add(data, type, f.Size, 0, hotspot);
+					// SheetBuilder expects data in BGRA
+					var data = FrameToBGRA(kv.Key, f, palette);
+					c.Sprites[c.Length++] = sheetBuilder.Add(data, f.Size, 0, hotspot);

 					// Bounds relative to the hotspot
 					c.Bounds = Rectangle.Union(c.Bounds, new Rectangle(hotspot, f.Size));
@@ -224,27 +217,33 @@ namespace OpenRA.Graphics
 			Update();
 		}

-		public static byte[] ConvertIndexedToBgra(string name, ISpriteFrame frame, ImmutablePalette palette)
+		public static byte[] FrameToBGRA(string name, ISpriteFrame frame, ImmutablePalette palette)
 		{
-			if (frame.Type != SpriteFrameType.Indexed8)
-				throw new ArgumentException("ConvertIndexedToBgra requires input frames to be indexed.", nameof(frame));
+			// Data is already in BGRA format
+			if (frame.Type == SpriteFrameType.BGRA)
+				return frame.Data;

+			// Cursors may be either native BGRA or Indexed.
+			// Indexed sprites are converted to BGRA using the referenced palette.
 			// All palettes must be explicitly referenced, even if they are embedded in the sprite.
-			if (palette == null)
+			if (frame.Type == SpriteFrameType.Indexed && palette == null)
 				throw new InvalidOperationException("Cursor sequence `{0}` attempted to load an indexed sprite but does not define Palette".F(name));

 			var width = frame.Size.Width;
 			var height = frame.Size.Height;
 			var data = new byte[4 * width * height];
-			unsafe
+			for (var j = 0; j < height; j++)
 			{
-				// Cast the data to an int array so we can copy the src data directly
-				fixed (byte* bd = &data[0])
+				for (var i = 0; i < width; i++)
 				{
-					var rgba = (uint*)bd;
-					for (var j = 0; j < height; j++)
-						for (var i = 0; i < width; i++)
-							rgba[j * width + i] = palette[frame.Data[j * width + i]];
+					var rgba = palette[frame.Data[j * width + i]];
+					var k = 4 * (j * width + i);
+
+					// Convert RGBA to BGRA
+					data[k] = (byte)(rgba >> 16);
+					data[k + 1] = (byte)(rgba >> 8);
+					data[k + 2] = (byte)(rgba >> 0);
+					data[k + 3] = (byte)(rgba >> 24);
 				}
 			}

--- a/OpenRA.Game/Graphics/Model.cs
+++ b/OpenRA.Game/Graphics/Model.cs
@@ -45,7 +45,6 @@ namespace OpenRA.Graphics

 	public interface IModelCache : IDisposable
 	{
-		IModel GetModel(string model);
 		IModel GetModelSequence(string model, string sequence);
 		bool HasModelSequence(string model, string sequence);
 		IVertexBuffer<Vertex> VertexBuffer { get; }
@@ -67,11 +66,6 @@ namespace OpenRA.Graphics

 			public void Dispose() { }

-			public IModel GetModel(string model)
-			{
-				throw new NotImplementedException();
-			}
-
 			public IModel GetModelSequence(string model, string sequence)
 			{
 				throw new NotImplementedException();
--- a/OpenRA.Game/Graphics/Sheet.cs
+++ b/OpenRA.Game/Graphics/Sheet.cs
@@ -79,17 +79,21 @@ namespace OpenRA.Graphics

 		public Png AsPng()
 		{
-			if (Type == SheetType.Indexed)
-				throw new InvalidOperationException("AsPng() cannot be called on Indexed sheets.");
+			var data = GetData();

-			return new Png(GetData(), SpriteFrameType.Bgra32, Size.Width, Size.Height);
+			// Convert BGRA to RGBA
+			for (var i = 0; i < Size.Width * Size.Height; i++)
+			{
+				var temp = data[i * 4];
+				data[i * 4] = data[i * 4 + 2];
+				data[i * 4 + 2] = temp;
+			}
+
+			return new Png(data, Size.Width, Size.Height);
 		}

 		public Png AsPng(TextureChannel channel, IPalette pal)
 		{
-			if (Type != SheetType.Indexed)
-				throw new InvalidOperationException("AsPng(TextureChannel, IPalette) can only be called on Indexed sheets.");
-
 			var d = GetData();
 			var plane = new byte[Size.Width * Size.Height];
 			var dataStride = 4 * Size.Width;
@@ -103,7 +107,7 @@ namespace OpenRA.Graphics
 			for (var i = 0; i < Palette.Size; i++)
 				palColors[i] = pal.GetColor(i);

-			return new Png(plane, SpriteFrameType.Bgra32, Size.Width, Size.Height, palColors);
+			return new Png(plane, Size.Width, Size.Height, palColors);
 		}

 		public void CreateBuffer()
--- a/OpenRA.Game/Graphics/SheetBuilder.cs
+++ b/OpenRA.Game/Graphics/SheetBuilder.cs
@@ -52,15 +52,8 @@ namespace OpenRA.Graphics
 		{
 			switch (t)
 			{
-				case SpriteFrameType.Indexed8:
-					return SheetType.Indexed;
-
-				// Util.FastCopyIntoChannel will automatically convert these to BGRA
-				case SpriteFrameType.Bgra32:
-				case SpriteFrameType.Bgr24:
-				case SpriteFrameType.Rgba32:
-				case SpriteFrameType.Rgb24:
-					return SheetType.BGRA;
+				case SpriteFrameType.Indexed: return SheetType.Indexed;
+				case SpriteFrameType.BGRA: return SheetType.BGRA;
 				default: throw new NotImplementedException("Unknown SpriteFrameType {0}".F(t));
 			}
 		}
@@ -81,16 +74,16 @@ namespace OpenRA.Graphics
 			this.margin = margin;
 		}

-		public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Type, frame.Size, 0, frame.Offset); }
-		public Sprite Add(byte[] src, SpriteFrameType type, Size size) { return Add(src, type, size, 0, float3.Zero); }
-		public Sprite Add(byte[] src, SpriteFrameType type, Size size, float zRamp, in float3 spriteOffset)
+		public Sprite Add(ISpriteFrame frame) { return Add(frame.Data, frame.Size, 0, frame.Offset); }
+		public Sprite Add(byte[] src, Size size) { return Add(src, size, 0, float3.Zero); }
+		public Sprite Add(byte[] src, Size size, float zRamp, in float3 spriteOffset)
 		{
 			// Don't bother allocating empty sprites
 			if (size.Width == 0 || size.Height == 0)
 				return new Sprite(current, Rectangle.Empty, 0, spriteOffset, channel, BlendMode.Alpha);

 			var rect = Allocate(size, zRamp, spriteOffset);
-			Util.FastCopyIntoChannel(rect, src, type);
+			Util.FastCopyIntoChannel(rect, src);
 			current.CommitBufferedData();
 			return rect;
 		}
@@ -103,6 +96,15 @@ namespace OpenRA.Graphics
 			return rect;
 		}

+		public Sprite Add(Size size, byte paletteIndex)
+		{
+			var data = new byte[size.Width * size.Height];
+			for (var i = 0; i < data.Length; i++)
+				data[i] = paletteIndex;
+
+			return Add(data, size);
+		}
+
 		TextureChannel? NextChannel(TextureChannel t)
 		{
 			var nextChannel = (int)t + (int)Type;
--- a/OpenRA.Game/Graphics/SpriteLoader.cs
+++ b/OpenRA.Game/Graphics/SpriteLoader.cs
@@ -18,29 +18,7 @@ using OpenRA.Primitives;

 namespace OpenRA.Graphics
 {
-	/// <summary>
-	/// Describes the format of the pixel data in a ISpriteFrame.
-	/// Note that the channel order is defined for little-endian bytes, so BGRA corresponds
-	/// to a 32bit ARGB value, such as that returned by Color.ToArgb()!
-	/// </summary>
-	public enum SpriteFrameType
-	{
-		// 8 bit index into an external palette
-		Indexed8,
-
-		// 32 bit color such as returned by Color.ToArgb() or the bmp file format
-		// (remember that little-endian systems place the little bits in the first byte!)
-		Bgra32,
-
-		// Like BGRA, but without an alpha channel
-		Bgr24,
-
-		// 32 bit color in big-endian format, like png
-		Rgba32,
-
-		// Like RGBA, but without an alpha channel
-		Rgb24
-	}
+	public enum SpriteFrameType { Indexed, BGRA }

 	public interface ISpriteLoader
 	{
@@ -69,7 +47,7 @@ namespace OpenRA.Graphics

 	public class SpriteCache
 	{
-		public readonly Cache<SheetType, SheetBuilder> SheetBuilders;
+		public readonly Cache<SpriteFrameType, SheetBuilder> SheetBuilders;
 		readonly ISpriteLoader[] loaders;
 		readonly IReadOnlyFileSystem fileSystem;

@@ -79,7 +57,7 @@ namespace OpenRA.Graphics

 		public SpriteCache(IReadOnlyFileSystem fileSystem, ISpriteLoader[] loaders)
 		{
-			SheetBuilders = new Cache<SheetType, SheetBuilder>(t => new SheetBuilder(t));
+			SheetBuilders = new Cache<SpriteFrameType, SheetBuilder>(t => new SheetBuilder(SheetBuilder.FrameTypeToSheetType(t)));

 			this.fileSystem = fileSystem;
 			this.loaders = loaders;
@@ -125,7 +103,7 @@ namespace OpenRA.Graphics
 					{
 						if (unloaded[i] != null)
 						{
-							sprite[i] = SheetBuilders[SheetBuilder.FrameTypeToSheetType(unloaded[i].Type)].Add(unloaded[i]);
+							sprite[i] = SheetBuilders[unloaded[i].Type].Add(unloaded[i]);
 							unloaded[i] = null;
 						}
 					}
--- a/OpenRA.Game/Graphics/Theater.cs
+++ b/OpenRA.Game/Graphics/Theater.cs
@@ -107,13 +107,12 @@ namespace OpenRA.Graphics
 							throw new YamlException("Sprite type mismatch. Terrain sprites must all be either Indexed or RGBA.");

 						var s = sheetBuilder.Allocate(f.Size, zRamp, offset);
-						Util.FastCopyIntoChannel(s, f.Data, f.Type);
+						Util.FastCopyIntoChannel(s, f.Data);

 						if (tileset.EnableDepth)
 						{
 							var ss = sheetBuilder.Allocate(f.Size, zRamp, offset);
-							var depthFrame = allFrames[j + frameCount];
-							Util.FastCopyIntoChannel(ss, depthFrame.Data, depthFrame.Type);
+							Util.FastCopyIntoChannel(ss, allFrames[j + frameCount].Data);

 							// s and ss are guaranteed to use the same sheet
 							// because of the custom terrain sheet allocation
@@ -137,10 +136,7 @@ namespace OpenRA.Graphics
 			}

 			// 1x1px transparent tile
-			if (sheetBuilder.Type == SheetType.BGRA)
-				missingTile = sheetBuilder.Add(new byte[4], SpriteFrameType.Bgra32, new Size(1, 1));
-			else
-				missingTile = sheetBuilder.Add(new byte[1], SpriteFrameType.Indexed8, new Size(1, 1));
+			missingTile = sheetBuilder.Add(new byte[sheetBuilder.Type == SheetType.BGRA ? 4 : 1], new Size(1, 1));

 			Sheet.ReleaseBuffer();
 		}
@@ -172,7 +168,10 @@ namespace OpenRA.Graphics
 				for (var x = 0; x < template.Size.X; x++)
 				{
 					var tile = new TerrainTile(template.Id, (byte)(i++));
-					if (!tileset.TryGetTileInfo(tile, out var tileInfo))
+					var tileInfo = tileset.GetTileInfo(tile);
+
+					// Empty tile
+					if (tileInfo == null)
 						continue;

 					var sprite = TileSprite(tile);
--- a/OpenRA.Game/Graphics/Util.cs
+++ b/OpenRA.Game/Graphics/Util.cs
@@ -62,7 +62,7 @@ namespace OpenRA.Graphics
 			vertices[nv + 5] = new Vertex(a, r.Left, r.Top, sl, st, paletteTextureIndex, fAttribC, tint);
 		}

-		public static void FastCopyIntoChannel(Sprite dest, byte[] src, SpriteFrameType srcType)
+		public static void FastCopyIntoChannel(Sprite dest, byte[] src)
 		{
 			var destData = dest.Sheet.GetData();
 			var width = dest.Bounds.Width;
@@ -85,34 +85,12 @@ namespace OpenRA.Graphics
 						{
 							for (var i = 0; i < width; i++)
 							{
-								byte r, g, b, a;
-								switch (srcType)
-								{
-									case SpriteFrameType.Bgra32:
-									case SpriteFrameType.Bgr24:
-									{
-										b = src[k++];
-										g = src[k++];
-										r = src[k++];
-										a = srcType == SpriteFrameType.Bgra32 ? src[k++] : (byte)255;
-										break;
-									}
-
-									case SpriteFrameType.Rgba32:
-									case SpriteFrameType.Rgb24:
-									{
-										r = src[k++];
-										g = src[k++];
-										b = src[k++];
-										a = srcType == SpriteFrameType.Rgba32 ? src[k++] : (byte)255;
-										break;
-									}
-
-									default:
-										throw new InvalidOperationException("Unknown SpriteFrameType {0}".F(srcType));
-								}
-
+								var r = src[k++];
+								var g = src[k++];
+								var b = src[k++];
+								var a = src[k++];
 								var cc = Color.FromArgb(a, r, g, b);
+
 								data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
 							}
 						}
@@ -161,29 +139,16 @@ namespace OpenRA.Graphics
 						for (var i = 0; i < width; i++)
 						{
 							Color cc;
-							switch (src.Type)
+							if (src.Palette == null)
 							{
-								case SpriteFrameType.Indexed8:
-								{
-									cc = src.Palette[src.Data[k++]];
-									break;
-								}
-
-								case SpriteFrameType.Rgba32:
-								case SpriteFrameType.Rgb24:
-								{
-									var r = src.Data[k++];
-									var g = src.Data[k++];
-									var b = src.Data[k++];
-									var a = src.Type == SpriteFrameType.Rgba32 ? src.Data[k++] : (byte)255;
-									cc = Color.FromArgb(a, r, g, b);
-									break;
-								}
-
-								// Pngs don't support BGR[A], so no need to include them here
-								default:
-									throw new InvalidOperationException("Unknown SpriteFrameType {0}".F(src.Type));
+								var r = src.Data[k++];
+								var g = src.Data[k++];
+								var b = src.Data[k++];
+								var a = src.Data[k++];
+								cc = Color.FromArgb(a, r, g, b);
 							}
+							else
+								cc = src.Palette[src.Data[k++]];

 							data[(y + j) * destStride + x + i] = PremultiplyAlpha(cc).ToArgb();
 						}
--- a/OpenRA.Game/Manifest.cs
+++ b/OpenRA.Game/Manifest.cs
@@ -60,7 +60,7 @@ namespace OpenRA
 		public readonly string[]
 			Rules, ServerTraits,
 			Sequences, ModelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
-			Weapons, Voices, Notifications, Music, TileSets,
+			Weapons, Voices, Notifications, Music, Translations, TileSets,
 			ChromeMetrics, MapCompatibility, Missions, Hotkeys;

 		public readonly IReadOnlyDictionary<string, string> Packages;
@@ -128,6 +128,7 @@ namespace OpenRA
 			Voices = YamlList(yaml, "Voices");
 			Notifications = YamlList(yaml, "Notifications");
 			Music = YamlList(yaml, "Music");
+			Translations = YamlList(yaml, "Translations");
 			TileSets = YamlList(yaml, "TileSets");
 			ChromeMetrics = YamlList(yaml, "ChromeMetrics");
 			Missions = YamlList(yaml, "Missions");
--- a/OpenRA.Game/Map/Map.cs
+++ b/OpenRA.Game/Map/Map.cs
@@ -17,7 +17,6 @@ using System.Reflection;
 using System.Text;
 using OpenRA.FileFormats;
 using OpenRA.FileSystem;
-using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
@@ -174,6 +173,7 @@ namespace OpenRA
 			new MapField("Voices", "VoiceDefinitions", required: false),
 			new MapField("Music", "MusicDefinitions", required: false),
 			new MapField("Notifications", "NotificationDefinitions", required: false),
+			new MapField("Translations", "TranslationDefinitions", required: false)
 		};

 		// Format versions
@@ -204,8 +204,7 @@ namespace OpenRA
 		public readonly MiniYaml VoiceDefinitions;
 		public readonly MiniYaml MusicDefinitions;
 		public readonly MiniYaml NotificationDefinitions;
-
-		public readonly Dictionary<CPos, TerrainTile> ReplacedInvalidTerrainTiles = new Dictionary<CPos, TerrainTile>();
+		public readonly MiniYaml TranslationDefinitions;

 		// Generated data
 		public readonly MapGrid Grid;
@@ -288,6 +287,7 @@ namespace OpenRA
 			this.modData = modData;
 			var size = new Size(width, height);
 			Grid = modData.Manifest.Get<MapGrid>();
+			var tileRef = new TerrainTile(tileset.Templates.First().Key, 0);

 			Title = "Name your map here";
 			Author = "Your name here";
@@ -310,7 +310,7 @@ namespace OpenRA
 				Tiles.CellEntryChanged += UpdateRamp;
 			}

-			Tiles.Clear(tileset.DefaultTerrainTile);
+			Tiles.Clear(tileRef);

 			PostInit();
 		}
@@ -430,18 +430,12 @@ namespace OpenRA
 			foreach (var uv in AllCells.MapCoords)
 				CustomTerrain[uv] = byte.MaxValue;

-			// Replace invalid tiles and cache ramp state
+			// Cache initial ramp state
 			var tileset = Rules.TileSet;
-			foreach (var uv in AllCells.MapCoords)
+			foreach (var uv in AllCells)
 			{
-				if (!tileset.TryGetTileInfo(Tiles[uv], out var info))
-				{
-					ReplacedInvalidTerrainTiles[uv.ToCPos(this)] = Tiles[uv];
-					Tiles[uv] = tileset.DefaultTerrainTile;
-					info = tileset.GetTileInfo(tileset.DefaultTerrainTile);
-				}
-
-				Ramp[uv] = info.RampType;
+				var tile = tileset.GetTileInfo(Tiles[uv]);
+				Ramp[uv] = tile != null ? tile.RampType : (byte)0;
 			}

 			AllEdgeCells = UpdateEdgeCells();
@@ -449,7 +443,8 @@ namespace OpenRA

 		void UpdateRamp(CPos cell)
 		{
-			Ramp[cell] = Rules.TileSet.GetTileInfo(Tiles[cell]).RampType;
+			var tile = Rules.TileSet.GetTileInfo(Tiles[cell]);
+			Ramp[cell] = tile != null ? tile.RampType : (byte)0;
 		}

 		void InitializeCellProjection()
@@ -675,26 +670,32 @@ namespace OpenRA
 			Color left, right;
 			var tileset = Rules.TileSet;
 			var type = tileset.GetTileInfo(Tiles[uv]);
-			if (type.MinColor != type.MaxColor)
+			if (type != null)
 			{
-				left = Exts.ColorLerp(Game.CosmeticRandom.NextFloat(), type.MinColor, type.MaxColor);
-				right = Exts.ColorLerp(Game.CosmeticRandom.NextFloat(), type.MinColor, type.MaxColor);
+				if (type.MinColor != type.MaxColor)
+				{
+					left = Exts.ColorLerp(Game.CosmeticRandom.NextFloat(), type.MinColor, type.MaxColor);
+					right = Exts.ColorLerp(Game.CosmeticRandom.NextFloat(), type.MinColor, type.MaxColor);
+				}
+				else
+					left = right = type.MinColor;
+
+				if (tileset.MinHeightColorBrightness != 1.0f || tileset.MaxHeightColorBrightness != 1.0f)
+				{
+					var scale = float2.Lerp(tileset.MinHeightColorBrightness, tileset.MaxHeightColorBrightness, Height[uv] * 1f / Grid.MaximumTerrainHeight);
+					left = Color.FromArgb((int)(scale * left.R).Clamp(0, 255), (int)(scale * left.G).Clamp(0, 255), (int)(scale * left.B).Clamp(0, 255));
+					right = Color.FromArgb((int)(scale * right.R).Clamp(0, 255), (int)(scale * right.G).Clamp(0, 255), (int)(scale * right.B).Clamp(0, 255));
+				}
 			}
 			else
-				left = right = type.MinColor;
-
-			if (tileset.MinHeightColorBrightness != 1.0f || tileset.MaxHeightColorBrightness != 1.0f)
-			{
-				var scale = float2.Lerp(tileset.MinHeightColorBrightness, tileset.MaxHeightColorBrightness, Height[uv] * 1f / Grid.MaximumTerrainHeight);
-				left = Color.FromArgb((int)(scale * left.R).Clamp(0, 255), (int)(scale * left.G).Clamp(0, 255), (int)(scale * left.B).Clamp(0, 255));
-				right = Color.FromArgb((int)(scale * right.R).Clamp(0, 255), (int)(scale * right.G).Clamp(0, 255), (int)(scale * right.B).Clamp(0, 255));
-			}
+				left = right = Color.Black;

 			return (left, right);
 		}

 		public byte[] SavePreview()
 		{
+			var tileset = Rules.TileSet;
 			var actorTypes = Rules.Actors.Values.Where(a => a.HasTraitInfo<IMapPreviewSignatureInfo>());
 			var actors = ActorDefinitions.Where(a => actorTypes.Where(ai => ai.Name == a.Value.Value).Any());
 			var positions = new List<(MPos Position, Color Color)>();
@@ -714,73 +715,76 @@ namespace OpenRA
 			foreach (var worldimpsi in worldimpsis)
 				worldimpsi.PopulateMapPreviewSignatureCells(this, worldActorInfo, null, positions);

-			var isRectangularIsometric = Grid.Type == MapGridType.RectangularIsometric;
-
-			// Fudge the heightmap offset by adding as much extra as we need / can.
-			// This tries to correct for our incorrect assumption that MPos == PPos
-			var heightOffset = Math.Min(Grid.MaximumTerrainHeight, MapSize.Y - Bounds.Bottom);
-			var width = Bounds.Width;
-			var height = Bounds.Height + heightOffset;
-
-			var bitmapWidth = width;
-			if (isRectangularIsometric)
-				bitmapWidth = 2 * bitmapWidth - 1;
-
-			var stride = bitmapWidth * 4;
-			var pxStride = 4;
-			var minimapData = new byte[stride * height];
-			(Color Left, Color Right) terrainColor = default((Color, Color));
-
-			for (var y = 0; y < height; y++)
+			using (var stream = new MemoryStream())
 			{
-				for (var x = 0; x < width; x++)
+				var isRectangularIsometric = Grid.Type == MapGridType.RectangularIsometric;
+
+				// Fudge the heightmap offset by adding as much extra as we need / can.
+				// This tries to correct for our incorrect assumption that MPos == PPos
+				var heightOffset = Math.Min(Grid.MaximumTerrainHeight, MapSize.Y - Bounds.Bottom);
+				var width = Bounds.Width;
+				var height = Bounds.Height + heightOffset;
+
+				var bitmapWidth = width;
+				if (isRectangularIsometric)
+					bitmapWidth = 2 * bitmapWidth - 1;
+
+				var stride = bitmapWidth * 4;
+				var pxStride = 4;
+				var minimapData = new byte[stride * height];
+				(Color Left, Color Right) terrainColor = default((Color, Color));
+
+				for (var y = 0; y < height; y++)
 				{
-					var uv = new MPos(x + Bounds.Left, y + Bounds.Top);
-
-					// FirstOrDefault will return a (MPos.Zero, Color.Transparent) if positions is empty
-					var actorColor = positions.FirstOrDefault(ap => ap.Position == uv).Color;
-					if (actorColor.A == 0)
-						terrainColor = GetTerrainColorPair(uv);
-
-					if (isRectangularIsometric)
+					for (var x = 0; x < width; x++)
 					{
-						// Odd rows are shifted right by 1px
-						var dx = uv.V & 1;
-						var xOffset = pxStride * (2 * x + dx);
-						if (x + dx > 0)
+						var uv = new MPos(x + Bounds.Left, y + Bounds.Top);
+
+						// FirstOrDefault will return a (MPos.Zero, Color.Transparent) if positions is empty
+						var actorColor = positions.FirstOrDefault(ap => ap.Position == uv).Color;
+						if (actorColor.A == 0)
+							terrainColor = GetTerrainColorPair(uv);
+
+						if (isRectangularIsometric)
 						{
-							var z = y * stride + xOffset - pxStride;
+							// Odd rows are shifted right by 1px
+							var dx = uv.V & 1;
+							var xOffset = pxStride * (2 * x + dx);
+							if (x + dx > 0)
+							{
+								var z = y * stride + xOffset - pxStride;
+								var c = actorColor.A == 0 ? terrainColor.Left : actorColor;
+								minimapData[z++] = c.R;
+								minimapData[z++] = c.G;
+								minimapData[z++] = c.B;
+								minimapData[z] = c.A;
+							}
+
+							if (xOffset < stride)
+							{
+								var z = y * stride + xOffset;
+								var c = actorColor.A == 0 ? terrainColor.Right : actorColor;
+								minimapData[z++] = c.R;
+								minimapData[z++] = c.G;
+								minimapData[z++] = c.B;
+								minimapData[z] = c.A;
+							}
+						}
+						else
+						{
+							var z = y * stride + pxStride * x;
 							var c = actorColor.A == 0 ? terrainColor.Left : actorColor;
 							minimapData[z++] = c.R;
 							minimapData[z++] = c.G;
 							minimapData[z++] = c.B;
 							minimapData[z] = c.A;
 						}
-
-						if (xOffset < stride)
-						{
-							var z = y * stride + xOffset;
-							var c = actorColor.A == 0 ? terrainColor.Right : actorColor;
-							minimapData[z++] = c.R;
-							minimapData[z++] = c.G;
-							minimapData[z++] = c.B;
-							minimapData[z] = c.A;
-						}
-					}
-					else
-					{
-						var z = y * stride + pxStride * x;
-						var c = actorColor.A == 0 ? terrainColor.Left : actorColor;
-						minimapData[z++] = c.R;
-						minimapData[z++] = c.G;
-						minimapData[z++] = c.B;
-						minimapData[z] = c.A;
 					}
 				}
-			}

-			var png = new Png(minimapData, SpriteFrameType.Bgra32, bitmapWidth, height);
-			return png.Save();
+				var png = new Png(minimapData, bitmapWidth, height);
+				return png.Save();
+			}
 		}

 		public bool Contains(CPos cell)
--- a/OpenRA.Game/Map/MapCache.cs
+++ b/OpenRA.Game/Map/MapCache.cs
@@ -166,6 +166,7 @@ namespace OpenRA
 		public void QueryRemoteMapDetails(string repositoryUrl, IEnumerable<string> uids, Action<MapPreview> mapDetailsReceived = null, Action queryFailed = null)
 		{
 			var maps = uids.Distinct()
+				.Where(uid => uid != null)
 				.Select(uid => previews[uid])
 				.Where(p => p.Status == MapStatus.Unavailable)
 				.ToDictionary(p => p.Uid, p => p);
--- a/OpenRA.Game/Map/PlayerReference.cs
+++ b/OpenRA.Game/Map/PlayerReference.cs
@@ -50,6 +50,9 @@ namespace OpenRA
 		public bool LockTeam = false;
 		public int Team = 0;

+		public bool LockHandicap = false;
+		public int Handicap = 0;
+
 		public string[] Allies = { };
 		public string[] Enemies = { };

--- a/OpenRA.Game/Map/TileReference.cs
+++ b/OpenRA.Game/Map/TileReference.cs
@@ -23,8 +23,6 @@ namespace OpenRA
 		}

 		public override int GetHashCode() { return Type.GetHashCode() ^ Index.GetHashCode(); }
-
-		public override string ToString() { return Type + "," + Index; }
 	}

 	public struct ResourceTile
--- a/OpenRA.Game/Map/TileSet.cs
+++ b/OpenRA.Game/Map/TileSet.cs
@@ -221,30 +221,25 @@ namespace OpenRA

 		public byte GetTerrainIndex(TerrainTile r)
 		{
-			var tile = Templates[r.Type][r.Index];
-			if (tile.TerrainType != byte.MaxValue)
-				return tile.TerrainType;
+			if (!Templates.TryGetValue(r.Type, out var tpl))
+				return defaultWalkableTerrainIndex;
+
+			if (tpl.Contains(r.Index))
+			{
+				var tile = tpl[r.Index];
+				if (tile != null && tile.TerrainType != byte.MaxValue)
+					return tile.TerrainType;
+			}

 			return defaultWalkableTerrainIndex;
 		}

 		public TerrainTileInfo GetTileInfo(TerrainTile r)
 		{
-			return Templates[r.Type][r.Index];
+			if (!Templates.TryGetValue(r.Type, out var tpl))
+				return null;
+
+			return tpl.Contains(r.Index) ? tpl[r.Index] : null;
 		}
-
-		public bool TryGetTileInfo(TerrainTile r, out TerrainTileInfo info)
-		{
-			if (!Templates.TryGetValue(r.Type, out var tpl) || !tpl.Contains(r.Index))
-			{
-				info = null;
-				return false;
-			}
-
-			info = tpl[r.Index];
-			return info != null;
-		}
-
-		public TerrainTile DefaultTerrainTile { get { return new TerrainTile(Templates.First().Key, 0); } }
 	}
 }
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -138,6 +138,42 @@ namespace OpenRA

 		public IEnumerable<string> Languages { get; private set; }

+		void LoadTranslations(Map map)
+		{
+			var selectedTranslations = new Dictionary<string, string>();
+			var defaultTranslations = new Dictionary<string, string>();
+
+			if (!Manifest.Translations.Any())
+			{
+				Languages = new string[0];
+				return;
+			}
+
+			var yaml = MiniYaml.Load(map, Manifest.Translations, map.TranslationDefinitions);
+			Languages = yaml.Select(t => t.Key).ToArray();
+
+			foreach (var y in yaml)
+			{
+				if (y.Key == Game.Settings.Graphics.Language)
+					selectedTranslations = y.Value.ToDictionary(my => my.Value ?? "");
+				else if (y.Key == Game.Settings.Graphics.DefaultLanguage)
+					defaultTranslations = y.Value.ToDictionary(my => my.Value ?? "");
+			}
+
+			var translations = new Dictionary<string, string>();
+			foreach (var tkv in defaultTranslations.Concat(selectedTranslations))
+			{
+				if (translations.ContainsKey(tkv.Key))
+					continue;
+				if (selectedTranslations.ContainsKey(tkv.Key))
+					translations.Add(tkv.Key, selectedTranslations[tkv.Key]);
+				else
+					translations.Add(tkv.Key, tkv.Value);
+			}
+
+			FieldLoader.SetTranslations(translations);
+		}
+
 		public Map PrepareMap(string uid)
 		{
 			LoadScreen?.Display();
@@ -149,6 +185,8 @@ namespace OpenRA
 			using (new Support.PerfTimer("Map"))
 				map = new Map(this, MapCache[uid].Package);

+			LoadTranslations(map);
+
 			// Reinitialize all our assets
 			InitializeLoaders(map);

--- a/OpenRA.Game/Network/GameSave.cs
+++ b/OpenRA.Game/Network/GameSave.cs
@@ -25,6 +25,7 @@ namespace OpenRA.Network
 		public readonly string Faction;
 		public readonly int SpawnPoint;
 		public readonly int Team;
+		public readonly int Handicap;
 		public readonly string Slot;
 		public readonly string Bot;
 		public readonly bool IsAdmin;
@@ -39,6 +40,7 @@ namespace OpenRA.Network
 			Faction = client.Faction;
 			SpawnPoint = client.SpawnPoint;
 			Team = client.Team;
+			Handicap = client.Handicap;
 			Slot = client.Slot;
 			Bot = client.Bot;
 			IsAdmin = client.IsAdmin;
@@ -53,6 +55,7 @@ namespace OpenRA.Network
 			client.Faction = Faction;
 			client.SpawnPoint = SpawnPoint;
 			client.Team = Team;
+			client.Handicap = Handicap;
 			client.Slot = Slot;
 			client.Bot = Bot;
 			client.IsAdmin = IsAdmin;
--- a/OpenRA.Game/Network/Session.cs
+++ b/OpenRA.Game/Network/Session.cs
@@ -144,6 +144,7 @@ namespace OpenRA.Network

 			public ClientState State = ClientState.Invalid;
 			public int Team;
+			public int Handicap;
 			public string Slot; // Slot ID, or null for observer
 			public string Bot; // Bot type, null for real clients
 			public int BotControllerClientIndex; // who added the bot to the slot
@@ -193,6 +194,7 @@ namespace OpenRA.Network
 			public bool LockFaction;
 			public bool LockColor;
 			public bool LockTeam;
+			public bool LockHandicap;
 			public bool LockSpawn;
 			public bool Required;

--- a/OpenRA.Game/ObjectCreator.cs
+++ b/OpenRA.Game/ObjectCreator.cs
@@ -15,7 +15,6 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using OpenRA.Primitives;
-using OpenRA.Support;

 namespace OpenRA
 {
@@ -43,48 +42,25 @@ namespace OpenRA
 				if (resolvedPath == null)
 					throw new FileNotFoundException("Assembly `{0}` not found.".F(path));

-				LoadAssembly(assemblyList, resolvedPath);
+				// .NET doesn't provide any way of querying the metadata of an assembly without either:
+				//   (a) loading duplicate data into the application domain, breaking the world.
+				//   (b) crashing if the assembly has already been loaded.
+				// We can't check the internal name of the assembly, so we'll work off the data instead
+				var hash = CryptoUtil.SHA1Hash(File.ReadAllBytes(resolvedPath));
+
+				if (!ResolvedAssemblies.TryGetValue(hash, out var assembly))
+				{
+					assembly = Assembly.LoadFile(resolvedPath);
+					ResolvedAssemblies.Add(hash, assembly);
+				}
+
+				assemblyList.Add(assembly);
 			}

 			AppDomain.CurrentDomain.AssemblyResolve += ResolveAssembly;
 			assemblies = assemblyList.SelectMany(asm => asm.GetNamespaces().Select(ns => (asm, ns))).ToArray();
 		}

-		void LoadAssembly(List<Assembly> assemblyList, string resolvedPath)
-		{
-			// .NET doesn't provide any way of querying the metadata of an assembly without either:
-			//   (a) loading duplicate data into the application domain, breaking the world.
-			//   (b) crashing if the assembly has already been loaded.
-			// We can't check the internal name of the assembly, so we'll work off the data instead
-			var hash = CryptoUtil.SHA1Hash(File.ReadAllBytes(resolvedPath));
-
-			if (!ResolvedAssemblies.TryGetValue(hash, out var assembly))
-			{
-#if MONO
-				assembly = Assembly.LoadFile(resolvedPath);
-				ResolvedAssemblies.Add(hash, assembly);
-
-				// Allow mods to use libraries.
-				var assemblyPath = Path.GetDirectoryName(resolvedPath);
-				if (assemblyPath != null)
-				{
-					foreach (var referencedAssembly in assembly.GetReferencedAssemblies())
-					{
-						var depedencyPath = Path.Combine(assemblyPath, referencedAssembly.Name + ".dll");
-						if (File.Exists(depedencyPath))
-							LoadAssembly(assemblyList, depedencyPath);
-					}
-				}
-#else
-				var loader = new AssemblyLoader(resolvedPath);
-				assembly = loader.LoadDefaultAssembly();
-				ResolvedAssemblies.Add(hash, assembly);
-#endif
-			}
-
-			assemblyList.Add(assembly);
-		}
-
 		Assembly ResolveAssembly(object sender, ResolveEventArgs e)
 		{
 			foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Optimize>true</Optimize>
    <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -34,16 +34,11 @@
  <ItemGroup>
    <PackageReference Include="OpenRA-Eluant" Version="1.0.17" />
    <PackageReference Include="OpenRA-Open.NAT" Version="1.0.0" />
-    <PackageReference Include="SharpZipLib" Version="1.3.1" />
+    <PackageReference Include="SharpZipLib" Version="1.2.0" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
    <AdditionalFiles Include="../stylecop.json" />
  </ItemGroup>
-  <ItemGroup Condition="'$(Mono)' == ''">
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.3-runtime.20214.6" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
-  </ItemGroup>
  <Target Name="DisableAnalyzers" BeforeTargets="CoreCompile" Condition="'$(Configuration)'=='Release'">
    <!-- Disable code style analysis on Release builds to improve compile-time performance -->
    <ItemGroup Condition="'$(Configuration)'=='Release'">
--- a/OpenRA.Game/Player.cs
+++ b/OpenRA.Game/Player.cs
@@ -58,6 +58,7 @@ namespace OpenRA
 		public readonly bool Playable = true;
 		public readonly int ClientIndex;
 		public readonly CPos HomeLocation;
+		public readonly int Handicap;
 		public readonly PlayerReference PlayerReference;
 		public readonly bool IsBot;
 		public readonly string BotType;
@@ -180,6 +181,8 @@ namespace OpenRA
 				HomeLocation = assignSpawnPoints?.AssignHomeLocation(world, client, playerRandom) ?? pr.HomeLocation;
 				SpawnPoint = assignSpawnPoints?.SpawnPointForPlayer(this) ?? client.SpawnPoint;
 				DisplaySpawnPoint = client.SpawnPoint;
+
+				Handicap = client.Handicap;
 			}
 			else
 			{
@@ -195,6 +198,7 @@ namespace OpenRA
 				DisplayFaction = ResolveDisplayFaction(world, pr.Faction);
 				HomeLocation = pr.HomeLocation;
 				SpawnPoint = DisplaySpawnPoint = 0;
+				Handicap = pr.Handicap;
 			}

 			if (!spectating)
--- a/OpenRA.Game/Renderer.cs
+++ b/OpenRA.Game/Renderer.cs
@@ -431,15 +431,24 @@ namespace OpenRA
 			var srcWidth = screenSprite.Sheet.Size.Width;
 			var destWidth = screenSprite.Bounds.Width;
 			var destHeight = -screenSprite.Bounds.Height;
+			var channelOrder = new[] { 2, 1, 0, 3 };

 			ThreadPool.QueueUserWorkItem(_ =>
 			{
-				// Extract the screen rect from the (larger) backing surface
+				// Convert BGRA to RGBA
 				var dest = new byte[4 * destWidth * destHeight];
 				for (var y = 0; y < destHeight; y++)
-					Array.Copy(src, 4 * y * srcWidth, dest, 4 * y * destWidth, 4 * destWidth);
+				{
+					for (var x = 0; x < destWidth; x++)
+					{
+						var destOffset = 4 * (y * destWidth + x);
+						var srcOffset = 4 * (y * srcWidth + x);
+						for (var i = 0; i < 4; i++)
+							dest[destOffset + i] = src[srcOffset + channelOrder[i]];
+					}
+				}

-				new Png(dest, SpriteFrameType.Bgra32, destWidth, destHeight).Save(path);
+				new Png(dest, destWidth, destHeight).Save(path);
 			});
 		}

--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -93,6 +93,8 @@ namespace OpenRA.Server
 				c.SpawnPoint = pr.Spawn;
 			if (pr.LockTeam)
 				c.Team = pr.Team;
+			if (pr.LockHandicap)
+				c.Team = pr.Handicap;

 			c.Color = pr.LockColor ? pr.Color : c.PreferredColor;
 		}
@@ -437,6 +439,7 @@ namespace OpenRA.Server
 					Faction = "Random",
 					SpawnPoint = 0,
 					Team = 0,
+					Handicap = 0,
 					State = Session.ClientState.Invalid,
 				};

@@ -660,28 +663,16 @@ namespace OpenRA.Server
 			}
 		}

-		byte[] CreateFrame(int client, int frame, byte[] data)
+		void DispatchOrdersToClient(Connection c, int client, int frame, byte[] data)
 		{
-			using (var ms = new MemoryStream(data.Length + 12))
+			try
 			{
+				var ms = new MemoryStream(data.Length + 12);
 				ms.WriteArray(BitConverter.GetBytes(data.Length + 4));
 				ms.WriteArray(BitConverter.GetBytes(client));
 				ms.WriteArray(BitConverter.GetBytes(frame));
 				ms.WriteArray(data);
-				return ms.GetBuffer();
-			}
-		}
-
-		void DispatchOrdersToClient(Connection c, int client, int frame, byte[] data)
-		{
-			DispatchFrameToClient(c, client, CreateFrame(client, frame, data));
-		}
-
-		void DispatchFrameToClient(Connection c, int client, byte[] frameData)
-		{
-			try
-			{
-				SendData(c.Socket, frameData);
+				SendData(c.Socket, ms.ToArray());
 			}
 			catch (Exception e)
 			{
@@ -789,9 +780,8 @@ namespace OpenRA.Server
 		public void DispatchOrdersToClients(Connection conn, int frame, byte[] data)
 		{
 			var from = conn != null ? conn.PlayerIndex : 0;
-			var frameData = CreateFrame(from, frame, data);
 			foreach (var c in Conns.Except(conn).ToList())
-				DispatchFrameToClient(c, from, frameData);
+				DispatchOrdersToClient(c, from, frame, data);

 			if (recorder != null)
 			{
--- a/OpenRA.Game/Settings.cs
+++ b/OpenRA.Game/Settings.cs
@@ -190,6 +190,9 @@ namespace OpenRA

 		public int BatchSize = 8192;
 		public int SheetSize = 2048;
+
+		public string Language = "english";
+		public string DefaultLanguage = "english";
 	}

 	public class SoundSettings
@@ -253,6 +256,8 @@ namespace OpenRA
 		public int IntroductionPromptVersion = 0;

 		public MPGameFilters MPGameFilters = MPGameFilters.Waiting | MPGameFilters.Empty | MPGameFilters.Protected | MPGameFilters.Started;
+
+		public bool PauseShellmap = false;
 	}

 	public class Settings
--- a/OpenRA.Game/Support/AssemblyLoader.cs
+++ b/OpenRA.Game/Support/AssemblyLoader.cs
@@ -1,363 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-// Not used/usable on Mono. Only used for Dotnet Core.
-// Based on https://github.com/natemcmaster/DotNetCorePlugins and used under the terms of the Apache 2.0 license
-#if !MONO
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Runtime.Loader;
-using Microsoft.Extensions.DependencyModel;
-
-namespace OpenRA.Support
-{
-	public class AssemblyLoader
-	{
-		readonly string mainAssembly;
-		readonly AssemblyLoadContext context;
-
-		public Assembly LoadDefaultAssembly() => context.LoadFromAssemblyPath(mainAssembly);
-
-		public AssemblyLoader(string assemblyFile)
-		{
-			mainAssembly = assemblyFile;
-			var baseDir = Path.GetDirectoryName(assemblyFile);
-
-			context = CreateLoadContext(baseDir, assemblyFile);
-		}
-
-		static AssemblyLoadContext CreateLoadContext(string baseDir, string assemblyFile)
-		{
-			var depsJsonFile = Path.Combine(baseDir, Path.GetFileNameWithoutExtension(assemblyFile) + ".deps.json");
-
-			var builder = new AssemblyLoadContextBuilder();
-
-			builder.TryAddDependencyContext(depsJsonFile, out _);
-			builder.SetBaseDirectory(baseDir);
-
-			return builder.Build();
-		}
-	}
-
-	public class AssemblyLoadContextBuilder
-	{
-		readonly Dictionary<string, ManagedLibrary> managedLibraries = new Dictionary<string, ManagedLibrary>(StringComparer.Ordinal);
-		readonly Dictionary<string, NativeLibrary> nativeLibraries = new Dictionary<string, NativeLibrary>(StringComparer.Ordinal);
-		string basePath;
-
-		public AssemblyLoadContext Build()
-		{
-			return new ManagedLoadContext(basePath, managedLibraries, nativeLibraries);
-		}
-
-		public AssemblyLoadContextBuilder SetBaseDirectory(string path)
-		{
-			if (string.IsNullOrEmpty(path))
-				throw new ArgumentException("Argument must not be null or empty.", nameof(path));
-
-			if (!Path.IsPathRooted(path))
-				throw new ArgumentException("Argument must be a full path.", nameof(path));
-
-			basePath = path;
-			return this;
-		}
-
-		public AssemblyLoadContextBuilder AddManagedLibrary(ManagedLibrary library)
-		{
-			managedLibraries.Add(library.Name.Name, library);
-			return this;
-		}
-
-		public AssemblyLoadContextBuilder AddNativeLibrary(NativeLibrary library)
-		{
-			ValidateRelativePath(library.AppLocalPath);
-			nativeLibraries.Add(library.Name, library);
-			return this;
-		}
-
-		static void ValidateRelativePath(string probingPath)
-		{
-			if (string.IsNullOrEmpty(probingPath))
-				throw new ArgumentException("Value must not be null or empty.", nameof(probingPath));
-
-			if (Path.IsPathRooted(probingPath))
-				throw new ArgumentException("Argument must be a relative path.", nameof(probingPath));
-		}
-	}
-
-	class ManagedLoadContext : AssemblyLoadContext
-	{
-		readonly string basePath;
-		readonly Dictionary<string, ManagedLibrary> managedAssemblies;
-		readonly Dictionary<string, NativeLibrary> nativeLibraries;
-
-		static readonly string[] NativeLibraryExtensions;
-		static readonly string[] NativeLibraryPrefixes;
-
-		static readonly string[] ManagedAssemblyExtensions =
-		{
-			".dll",
-			".ni.dll",
-			".exe",
-			".ni.exe"
-		};
-
-		static ManagedLoadContext()
-		{
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-			{
-				NativeLibraryPrefixes = new[] { "" };
-				NativeLibraryExtensions = new[] { ".dll" };
-			}
-			else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-			{
-				NativeLibraryPrefixes = new[] { "", "lib", };
-				NativeLibraryExtensions = new[] { ".dylib" };
-			}
-			else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-			{
-				NativeLibraryPrefixes = new[] { "", "lib" };
-				NativeLibraryExtensions = new[] { ".so", ".so.1" };
-			}
-			else
-			{
-				NativeLibraryPrefixes = Array.Empty<string>();
-				NativeLibraryExtensions = Array.Empty<string>();
-			}
-		}
-
-		public ManagedLoadContext(string baseDirectory, Dictionary<string, ManagedLibrary> managedAssemblies, Dictionary<string, NativeLibrary> nativeLibraries)
-		{
-			basePath = baseDirectory ?? throw new ArgumentNullException(nameof(baseDirectory));
-			this.managedAssemblies = managedAssemblies ?? throw new ArgumentNullException(nameof(managedAssemblies));
-			this.nativeLibraries = nativeLibraries ?? throw new ArgumentNullException(nameof(nativeLibraries));
-		}
-
-		protected override Assembly Load(AssemblyName assemblyName)
-		{
-			// If default context is preferred, check first for types in the default context unless the dependency has been declared as private
-			try
-			{
-				var defaultAssembly = Default.LoadFromAssemblyName(assemblyName);
-				if (defaultAssembly != null)
-					return null;
-			}
-			catch
-			{
-				// Swallow errors in loading from the default context
-			}
-
-			if (managedAssemblies.TryGetValue(assemblyName.Name, out var library) && SearchForLibrary(library, out var path))
-				return LoadFromAssemblyPath(path);
-
-			return null;
-		}
-
-		protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
-		{
-			foreach (var prefix in NativeLibraryPrefixes)
-				if (nativeLibraries.TryGetValue(prefix + unmanagedDllName, out var library) && SearchForLibrary(library, prefix, out var path))
-					return LoadUnmanagedDllFromPath(path);
-
-			return base.LoadUnmanagedDll(unmanagedDllName);
-		}
-
-		bool SearchForLibrary(ManagedLibrary library, out string path)
-		{
-			// 1. Search in base path
-			foreach (var ext in ManagedAssemblyExtensions)
-			{
-				var local = Path.Combine(basePath, library.Name.Name + ext);
-				if (File.Exists(local))
-				{
-					path = local;
-					return true;
-				}
-			}
-
-			path = null;
-			return false;
-		}
-
-		bool SearchForLibrary(NativeLibrary library, string prefix, out string path)
-		{
-			// 1. Search in base path
-			foreach (var ext in NativeLibraryExtensions)
-			{
-				var candidate = Path.Combine(basePath, $"{prefix}{library.Name}{ext}");
-				if (File.Exists(candidate))
-				{
-					path = candidate;
-					return true;
-				}
-			}
-
-			// 2. Search in base path + app local (for portable deployments of netcoreapp)
-			var local = Path.Combine(basePath, library.AppLocalPath);
-			if (File.Exists(local))
-			{
-				path = local;
-				return true;
-			}
-
-			path = null;
-			return false;
-		}
-	}
-
-	public class ManagedLibrary
-	{
-		public AssemblyName Name { get; private set; }
-
-		public static ManagedLibrary CreateFromPackage(string assetPath)
-		{
-			return new ManagedLibrary
-			{
-				Name = new AssemblyName(Path.GetFileNameWithoutExtension(assetPath))
-			};
-		}
-	}
-
-	public class NativeLibrary
-	{
-		public string Name { get; private set; }
-
-		public string AppLocalPath { get; private set; }
-
-		public static NativeLibrary CreateFromPackage(string assetPath)
-		{
-			return new NativeLibrary
-			{
-				Name = Path.GetFileNameWithoutExtension(assetPath),
-				AppLocalPath = assetPath
-			};
-		}
-	}
-
-	public static class DependencyContextExtensions
-	{
-		public static AssemblyLoadContextBuilder TryAddDependencyContext(this AssemblyLoadContextBuilder builder, string depsFilePath, out Exception error)
-		{
-			error = null;
-			try
-			{
-				builder.AddDependencyContext(depsFilePath);
-			}
-			catch (Exception ex)
-			{
-				error = ex;
-			}
-
-			return builder;
-		}
-
-		public static AssemblyLoadContextBuilder AddDependencyContext(this AssemblyLoadContextBuilder builder, string depsFilePath)
-		{
-			var reader = new DependencyContextJsonReader();
-			using (var file = File.OpenRead(depsFilePath))
-			{
-				var deps = reader.Read(file);
-				builder.SetBaseDirectory(Path.GetDirectoryName(depsFilePath));
-				builder.AddDependencyContext(deps);
-			}
-
-			return builder;
-		}
-
-		static string GetFallbackRid()
-		{
-			string ridBase;
-
-			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-				ridBase = "win10";
-			else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-				ridBase = "linux";
-			else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-				ridBase = "osx.10.12";
-			else
-				return "any";
-
-			switch (RuntimeInformation.OSArchitecture)
-			{
-				case Architecture.X86:
-					return ridBase + "-x86";
-				case Architecture.X64:
-					return ridBase + "-x64";
-				case Architecture.Arm:
-					return ridBase + "-arm";
-				case Architecture.Arm64:
-					return ridBase + "-arm64";
-			}
-
-			return ridBase;
-		}
-
-		public static AssemblyLoadContextBuilder AddDependencyContext(this AssemblyLoadContextBuilder builder, DependencyContext dependencyContext)
-		{
-			var ridGraph = dependencyContext.RuntimeGraph.Any()
-				? dependencyContext.RuntimeGraph
-				: DependencyContext.Default.RuntimeGraph;
-
-			var rid = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier();
-			var fallbackRid = GetFallbackRid();
-			var fallbackGraph = ridGraph.FirstOrDefault(g => g.Runtime == rid)
-								?? ridGraph.FirstOrDefault(g => g.Runtime == fallbackRid)
-								?? new RuntimeFallbacks("any");
-
-			foreach (var managed in dependencyContext.ResolveRuntimeAssemblies(fallbackGraph))
-				builder.AddManagedLibrary(managed);
-
-			foreach (var native in dependencyContext.ResolveNativeAssets(fallbackGraph))
-				builder.AddNativeLibrary(native);
-
-			return builder;
-		}
-
-		static IEnumerable<ManagedLibrary> ResolveRuntimeAssemblies(this DependencyContext depContext, RuntimeFallbacks runtimeGraph)
-		{
-			var rids = GetRids(runtimeGraph);
-			return from library in depContext.RuntimeLibraries
-				   from assetPath in SelectAssets(rids, library.RuntimeAssemblyGroups)
-				   select ManagedLibrary.CreateFromPackage(assetPath);
-		}
-
-		static IEnumerable<NativeLibrary> ResolveNativeAssets(this DependencyContext depContext, RuntimeFallbacks runtimeGraph)
-		{
-			var rids = GetRids(runtimeGraph);
-			return from library in depContext.RuntimeLibraries
-				   from assetPath in SelectAssets(rids, library.NativeLibraryGroups)
-				   where !assetPath.EndsWith(".a", StringComparison.Ordinal)
-				   select NativeLibrary.CreateFromPackage(assetPath);
-		}
-
-		static IEnumerable<string> GetRids(RuntimeFallbacks runtimeGraph)
-		{
-			return Enumerable.Concat(new[] { runtimeGraph.Runtime }, runtimeGraph?.Fallbacks ?? Enumerable.Empty<string>());
-		}
-
-		static IEnumerable<string> SelectAssets(IEnumerable<string> rids, IEnumerable<RuntimeAssetGroup> groups)
-		{
-			foreach (var rid in rids)
-			{
-				var group = groups.FirstOrDefault(g => g.Runtime == rid);
-				if (group != null)
-					return group.AssetPaths;
-			}
-
-			return groups.GetDefaultAssets();
-		}
-	}
-}
-#endif
--- a/OpenRA.Game/Traits/Player/Shroud.cs
+++ b/OpenRA.Game/Traits/Player/Shroud.cs
@@ -17,9 +17,11 @@ namespace OpenRA.Traits
 	[Desc("Required for shroud and fog visibility checks. Add this to the player actor.")]
 	public class ShroudInfo : TraitInfo, ILobbyOptions
 	{
+		[Translate]
 		[Desc("Descriptive label for the fog checkbox in the lobby.")]
 		public readonly string FogCheckboxLabel = "Fog of War";

+		[Translate]
 		[Desc("Tooltip description for the fog checkbox in the lobby.")]
 		public readonly string FogCheckboxDescription = "Line of sight is required to view enemy forces";

@@ -35,9 +37,11 @@ namespace OpenRA.Traits
 		[Desc("Display order for the fog checkbox in the lobby.")]
 		public readonly int FogCheckboxDisplayOrder = 0;

+		[Translate]
 		[Desc("Descriptive label for the explored map checkbox in the lobby.")]
 		public readonly string ExploredMapCheckboxLabel = "Explored Map";

+		[Translate]
 		[Desc("Tooltip description for the explored map checkbox in the lobby.")]
 		public readonly string ExploredMapCheckboxDescription = "Initial map shroud is revealed";

--- a/OpenRA.Game/Traits/World/Faction.cs
+++ b/OpenRA.Game/Traits/World/Faction.cs
@@ -28,6 +28,7 @@ namespace OpenRA.Traits
 		[Desc("The side that the faction belongs to. For example, England belongs to the 'Allies' side.")]
 		public readonly string Side = null;

+		[Translate]
 		public readonly string Description = null;

 		public readonly bool Selectable = true;
--- a/OpenRA.Game/World.cs
+++ b/OpenRA.Game/World.cs
@@ -32,6 +32,7 @@ namespace OpenRA
 		readonly List<IEffect> effects = new List<IEffect>();
 		readonly List<IEffect> unpartitionedEffects = new List<IEffect>();
 		readonly List<ISync> syncedEffects = new List<ISync>();
+		readonly GameSettings gameSettings;

 		readonly Queue<Action<World>> frameEndActions = new Queue<Action<World>>();

@@ -226,6 +227,7 @@ namespace OpenRA
 			};

 			RulesContainTemporaryBlocker = map.Rules.Actors.Any(a => a.Value.HasTraitInfo<ITemporaryBlockerInfo>());
+			gameSettings = Game.Settings.Game;
 		}

 		public void AddToMaps(Actor self, IOccupySpace ios)
@@ -424,7 +426,9 @@ namespace OpenRA
 				wasLoadingGameSave = false;
 			}

-			if (!Paused)
+			// Allow users to pause the shellmap via the settings menu
+			// Some traits initialize important state during the first tick, so we must allow it to tick at least once
+			if (!Paused && (Type != WorldType.Shellmap || !gameSettings.PauseShellmap || WorldTick == 0))
 			{
 				WorldTick++;

--- a/OpenRA.Launcher/OpenRA.Launcher.csproj
+++ b/OpenRA.Launcher/OpenRA.Launcher.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework Condition="'$(Mono)' == ''">net5.0</TargetFramework>
-    <TargetFramework Condition="'$(Mono)' != ''">netstandard2.1</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Optimize>true</Optimize>
    <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -18,8 +17,6 @@
    <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
    <Configurations>Release;Debug</Configurations>
    <AssemblyName>OpenRA</AssemblyName>
-    <IsPublishable Condition="'$(CopyGenericLauncher)' == 'False'">false</IsPublishable>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
  </PropertyGroup>
  <PropertyGroup>
    <TargetPlatform Condition="$([MSBuild]::IsOsPlatform('Windows'))">win-x64</TargetPlatform>
@@ -65,8 +62,4 @@
      <Analyzer Remove="@(Analyzer)" />
    </ItemGroup>
  </Target>
-  <ItemGroup>
-    <TrimmerRootAssembly Include="netstandard" />
-    <TrimmerRootAssembly Include="System.IO.Pipes" />
-  </ItemGroup>
 </Project>
--- a/OpenRA.Mods.Cnc/AudioLoaders/AudLoader.cs
+++ b/OpenRA.Mods.Cnc/AudioLoaders/AudLoader.cs
@@ -20,11 +20,15 @@ namespace OpenRA.Mods.Cnc.AudioLoaders
 		bool IsAud(Stream s)
 		{
 			var start = s.Position;
-			s.Position += 11;
+			s.Position += 10;
+			var readFlag = s.ReadByte();
 			var readFormat = s.ReadByte();
 			s.Position = start;

-			return readFormat == (int)SoundFormat.ImaAdpcm;
+			if (!Enum.IsDefined(typeof(SoundFlags), readFlag))
+				return false;
+
+			return Enum.IsDefined(typeof(SoundFormat), readFormat);
 		}

 		bool ISoundLoader.TryParseSound(Stream stream, out ISoundFormat sound)
@@ -49,8 +53,8 @@ namespace OpenRA.Mods.Cnc.AudioLoaders

 	public sealed class AudFormat : ISoundFormat
 	{
-		public int Channels { get { return channels; } }
-		public int SampleBits { get { return sampleBits; } }
+		public int Channels { get { return 1; } }
+		public int SampleBits { get { return 16; } }
 		public int SampleRate { get { return sampleRate; } }
 		public float LengthInSeconds { get { return AudReader.SoundLength(sourceStream); } }
 		public Stream GetPCMInputStream() { return audStreamFactory(); }
@@ -58,15 +62,13 @@ namespace OpenRA.Mods.Cnc.AudioLoaders

 		readonly Stream sourceStream;
 		readonly Func<Stream> audStreamFactory;
-		readonly int channels;
-		readonly int sampleBits;
 		readonly int sampleRate;

 		public AudFormat(Stream stream)
 		{
 			sourceStream = stream;

-			if (!AudReader.LoadSound(stream, out audStreamFactory, out sampleRate, out sampleBits, out channels))
+			if (!AudReader.LoadSound(stream, out audStreamFactory, out sampleRate))
 				throw new InvalidDataException();
 		}
 	}
--- a/OpenRA.Mods.Cnc/FileFormats/AudReader.cs
+++ b/OpenRA.Mods.Cnc/FileFormats/AudReader.cs
@@ -32,6 +32,11 @@ namespace OpenRA.Mods.Cnc.FileFormats

 	public static class AudReader
 	{
+		public static byte[] LoadSound(byte[] raw, ref int index)
+		{
+			return ImaAdpcmReader.LoadImaAdpcmSound(raw, ref index);
+		}
+
 		public static float SoundLength(Stream s)
 		{
 			var sampleRate = s.ReadUInt16();
@@ -49,7 +54,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
 			return (float)samples / sampleRate;
 		}

-		public static bool LoadSound(Stream s, out Func<Stream> result, out int sampleRate, out int sampleBits, out int channels)
+		public static bool LoadSound(Stream s, out Func<Stream> result, out int sampleRate)
 		{
 			result = null;
 			var startPosition = s.Position;
@@ -58,17 +63,15 @@ namespace OpenRA.Mods.Cnc.FileFormats
 				sampleRate = s.ReadUInt16();
 				var dataSize = s.ReadInt32();
 				var outputSize = s.ReadInt32();
+
 				var readFlag = s.ReadByte();
-				sampleBits = (readFlag & (int)SoundFlags._16Bit) == 0 ? 8 : 16;
-				channels = (readFlag & (int)SoundFlags.Stereo) == 0 ? 1 : 2;
+				if (!Enum.IsDefined(typeof(SoundFlags), readFlag))
+					return false;

 				var readFormat = s.ReadByte();
 				if (!Enum.IsDefined(typeof(SoundFormat), readFormat))
 					return false;

-				if (readFormat == (int)SoundFormat.WestwoodCompressed)
-					throw new NotImplementedException();
-
 				var offsetPosition = s.Position;

 				result = () =>
--- a/OpenRA.Mods.Cnc/FileSystem/MegFile.cs
+++ b/OpenRA.Mods.Cnc/FileSystem/MegFile.cs
@@ -1,138 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using OpenRA.FileSystem;
-using OpenRA.Primitives;
-
-namespace OpenRA.Mods.Cnc.FileSystem
-{
-	/// <summary>
-	/// This class supports loading unencrypted V3 .meg files using
-	/// reference documentation from here https://modtools.petrolution.net/docs/MegFileFormat
-	/// </summary>
-	public class MegV3Loader : IPackageLoader
-	{
-		const uint UnencryptedMegID = 0xFFFFFFFF;
-
-		// Float value 0.99, but it is simpler to read and compare as an integer
-		const uint MegVersion = 0x3F7D70A4;
-
-		public bool TryParsePackage(Stream s, string filename, OpenRA.FileSystem.FileSystem context, out IReadOnlyPackage package)
-		{
-			var position = s.Position;
-
-			var id = s.ReadUInt32();
-			var version = s.ReadUInt32();
-
-			s.Position = position;
-
-			if (id != UnencryptedMegID || version != MegVersion)
-			{
-				package = null;
-				return false;
-			}
-
-			package = new MegFile(s, filename);
-			return true;
-		}
-
-		public sealed class MegFile : IReadOnlyPackage
-		{
-			readonly Stream s;
-
-			readonly Dictionary<string, (uint Offset, int Length)> contents = new Dictionary<string, (uint Offset, int Length)>();
-
-			public MegFile(Stream s, string filename)
-			{
-				Name = filename;
-				this.s = s;
-
-				var id = s.ReadUInt32();
-				var version = s.ReadUInt32();
-
-				if (id != UnencryptedMegID || version != MegVersion)
-					throw new Exception("Invalid file signature for meg file");
-
-				var headerSize = s.ReadUInt32();
-				var numStrings = s.ReadUInt32();
-				var numFiles = s.ReadUInt32();
-				var stringsSize = s.ReadUInt32();
-				var stringsStart = s.Position;
-
-				var filenames = new List<string>();
-
-				// The file names are an indexed array of strings
-				for (var i = 0; i < numStrings; i++)
-				{
-					var length = s.ReadUInt16();
-					filenames.Add(s.ReadASCII(length));
-				}
-
-				// The header indicates where we should be, so verify it
-				if (s.Position != stringsSize + stringsStart)
-					throw new Exception("File name table in .meg file inconsistent");
-
-				// Now we load each file entry and associated info
-				for (var i = 0; i < numFiles; i++)
-				{
-					// Ignore flags, crc, index
-					s.Position += 10;
-					var size = s.ReadUInt32();
-					var offset = s.ReadUInt32();
-					var nameIndex = s.ReadUInt16();
-					contents[filenames[nameIndex]] = (offset, (int)size);
-				}
-
-				if (s.Position != headerSize)
-					throw new Exception("Expected to be at data start offset");
-			}
-
-			public string Name { get; }
-
-			public IEnumerable<string> Contents => contents.Keys;
-
-			public bool Contains(string filename)
-			{
-				return contents.ContainsKey(filename);
-			}
-
-			public void Dispose()
-			{
-				s.Dispose();
-			}
-
-			public Stream GetStream(string filename)
-			{
-				// Look up the index of the filename
-				if (!contents.TryGetValue(filename, out var index))
-					return null;
-
-				return SegmentStream.CreateWithoutOwningStream(s, index.Offset, index.Length);
-			}
-
-			public IReadOnlyPackage OpenPackage(string filename, OpenRA.FileSystem.FileSystem context)
-			{
-				var childStream = GetStream(filename);
-				if (childStream == null)
-					return null;
-
-				if (context.TryParsePackage(childStream, filename, out var package))
-					return package;
-
-				childStream.Dispose();
-				return null;
-			}
-		}
-	}
-}
--- a/OpenRA.Mods.Cnc/Graphics/Voxel.cs
+++ b/OpenRA.Mods.Cnc/Graphics/Voxel.cs
@@ -35,10 +35,10 @@ namespace OpenRA.Mods.Cnc.Graphics
 		uint IModel.Frames { get { return frames; } }
 		uint IModel.Sections { get { return limbs; } }

-		public Voxel(VoxelLoader loader, VxlReader vxl, HvaReader hva, (string Vxl, string Hva) files)
+		public Voxel(VoxelLoader loader, VxlReader vxl, HvaReader hva)
 		{
 			if (vxl.LimbCount != hva.LimbCount)
-				throw new InvalidOperationException("{0}.vxl and {1}.hva limb counts don't match.".F(files.Vxl, files.Hva));
+				throw new InvalidOperationException("Voxel and hva limb counts don't match");

 			transforms = hva.Transforms;
 			frames = hva.FrameCount;
--- a/OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
+++ b/OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
@@ -77,8 +77,8 @@ namespace OpenRA.Mods.Cnc.Graphics
 			var size = new Size(su, sv);
 			var s = sheetBuilder.Allocate(size);
 			var t = sheetBuilder.Allocate(size);
-			OpenRA.Graphics.Util.FastCopyIntoChannel(s, colors, SpriteFrameType.Indexed8);
-			OpenRA.Graphics.Util.FastCopyIntoChannel(t, normals, SpriteFrameType.Indexed8);
+			OpenRA.Graphics.Util.FastCopyIntoChannel(s, colors);
+			OpenRA.Graphics.Util.FastCopyIntoChannel(t, normals);

 			// s and t are guaranteed to use the same sheet because
 			// of the custom voxel sheet allocation implementation
@@ -216,10 +216,9 @@ namespace OpenRA.Mods.Cnc.Graphics
 			HvaReader hva;
 			using (var s = fileSystem.Open(files.Vxl + ".vxl"))
 				vxl = new VxlReader(s);
-
 			using (var s = fileSystem.Open(files.Hva + ".hva"))
 				hva = new HvaReader(s, files.Hva + ".hva");
-			return new Voxel(this, vxl, hva, files);
+			return new Voxel(this, vxl, hva);
 		}

 		public Voxel Load(string vxl, string hva)
--- a/OpenRA.Mods.Cnc/Graphics/VoxelModelSequenceLoader.cs
+++ b/OpenRA.Mods.Cnc/Graphics/VoxelModelSequenceLoader.cs
@@ -86,11 +86,6 @@ namespace OpenRA.Mods.Cnc.Graphics
 			return loader.Load(vxl, hva);
 		}

-		public IModel GetModel(string model)
-		{
-			return loader.Load(model, model);
-		}
-
 		public IModel GetModelSequence(string model, string sequence)
 		{
 			try { return models[model][sequence]; }
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Optimize>true</Optimize>
    <LangVersion>7.3</LangVersion>
@@ -11,7 +11,6 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
    <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
-    <IsPublishable Condition="'$(CopyCncDll)' == 'False'">false</IsPublishable>
  </PropertyGroup>
  <ItemGroup>
    <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
@@ -38,4 +37,4 @@
      <Analyzer Remove="@(Analyzer)" />
    </ItemGroup>
  </Target>
-</Project>
+</Project>
--- a/OpenRA.Mods.Cnc/SpriteLoaders/ShpD2Loader.cs
+++ b/OpenRA.Mods.Cnc/SpriteLoaders/ShpD2Loader.cs
@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders

 		class ShpD2Frame : ISpriteFrame
 		{
-			public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
+			public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
 			public Size Size { get; private set; }
 			public Size FrameSize { get { return Size; } }
 			public float2 Offset { get { return float2.Zero; } }
--- a/OpenRA.Mods.Cnc/SpriteLoaders/ShpTDLoader.cs
+++ b/OpenRA.Mods.Cnc/SpriteLoaders/ShpTDLoader.cs
@@ -77,7 +77,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders

 		class ImageHeader : ISpriteFrame
 		{
-			public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
+			public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
 			public Size Size { get { return reader.Size; } }
 			public Size FrameSize { get { return reader.Size; } }
 			public float2 Offset { get { return float2.Zero; } }
--- a/OpenRA.Mods.Cnc/SpriteLoaders/TmpRALoader.cs
+++ b/OpenRA.Mods.Cnc/SpriteLoaders/TmpRALoader.cs
@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
 	{
 		class TmpRAFrame : ISpriteFrame
 		{
-			public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
+			public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
 			public Size Size { get; private set; }
 			public Size FrameSize { get; private set; }
 			public float2 Offset { get { return float2.Zero; } }
--- a/OpenRA.Mods.Cnc/SpriteLoaders/TmpTDLoader.cs
+++ b/OpenRA.Mods.Cnc/SpriteLoaders/TmpTDLoader.cs
@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
 	{
 		class TmpTDFrame : ISpriteFrame
 		{
-			public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
+			public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
 			public Size Size { get; private set; }
 			public Size FrameSize { get; private set; }
 			public float2 Offset { get { return float2.Zero; } }
--- a/OpenRA.Mods.Cnc/SpriteLoaders/TmpTSLoader.cs
+++ b/OpenRA.Mods.Cnc/SpriteLoaders/TmpTSLoader.cs
@@ -21,7 +21,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
 		{
 			readonly TmpTSFrame parent;

-			public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
+			public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
 			public Size Size { get { return parent.Size; } }
 			public Size FrameSize { get { return Size; } }
 			public float2 Offset { get { return parent.Offset; } }
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders

 		class TmpTSFrame : ISpriteFrame
 		{
-			public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
+			public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
 			public Size Size { get; private set; }
 			public Size FrameSize { get { return Size; } }
 			public float2 Offset { get; private set; }
--- a/OpenRA.Mods.Cnc/Traits/Attack/AttackPopupTurreted.cs
+++ b/OpenRA.Mods.Cnc/Traits/Attack/AttackPopupTurreted.cs
@@ -82,6 +82,9 @@ namespace OpenRA.Mods.Cnc.Traits

 		protected override bool CanAttack(Actor self, in Target target)
 		{
+			if (IsTraitPaused)
+				return false;
+
 			if (state == PopupState.Closed)
 			{
 				state = PopupState.Transitioning;
@@ -103,6 +106,9 @@ namespace OpenRA.Mods.Cnc.Traits

 		void INotifyIdle.TickIdle(Actor self)
 		{
+			if (IsTraitDisabled || IsTraitPaused)
+				return;
+
 			if (state == PopupState.Open && idleTicks++ > info.CloseDelay)
 			{
 				var facingOffset = new WVec(0, -1024, 0).Rotate(WRot.FromYaw(info.DefaultFacing));
--- a/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs
+++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs
@@ -120,7 +120,7 @@ namespace OpenRA.Mods.Cnc.Traits
 		protected override void Tick(World world)
 		{
 			// Cancel the OG if we can't use the power
-			if (!manager.Powers.ContainsKey(order))
+			if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
 				world.CancelInputMode();
 		}

--- a/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs
+++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs
@@ -174,7 +174,7 @@ namespace OpenRA.Mods.Cnc.Traits
 			protected override void Tick(World world)
 			{
 				// Cancel the OG if we can't use the power
-				if (!manager.Powers.ContainsKey(order))
+				if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
 					world.CancelInputMode();
 			}

@@ -274,7 +274,7 @@ namespace OpenRA.Mods.Cnc.Traits
 			protected override void Tick(World world)
 			{
 				// Cancel the OG if we can't use the power
-				if (!manager.Powers.ContainsKey(order))
+				if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
 					world.CancelInputMode();
 			}

--- a/OpenRA.Mods.Cnc/Traits/SupportPowers/GrantPrerequisiteChargeDrainPower.cs
+++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/GrantPrerequisiteChargeDrainPower.cs
@@ -26,9 +26,11 @@ namespace OpenRA.Mods.Cnc.Traits
 		[Desc("The prerequisite type that this provides.")]
 		public readonly string Prerequisite = null;

+		[Translate]
 		[Desc("Label to display over the support power icon and in its tooltip while the power is active.")]
 		public readonly string ActiveText = "ACTIVE";

+		[Translate]
 		[Desc("Label to display over the support power icon and in its tooltip while the power is available but not active.")]
 		public readonly string AvailableText = "READY";

--- a/OpenRA.Mods.Cnc/UtilityCommands/ConvertPngToShpCommand.cs
+++ b/OpenRA.Mods.Cnc/UtilityCommands/ConvertPngToShpCommand.cs
@@ -14,7 +14,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
-using OpenRA.Graphics;
 using OpenRA.Mods.Cnc.SpriteLoaders;
 using OpenRA.Primitives;

@@ -36,7 +35,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
 			var dest = inputFiles[0].Split('-').First() + ".shp";

 			var frames = inputFiles.Select(a => new Png(File.OpenRead(a))).ToList();
-			if (frames.Any(f => f.Type != SpriteFrameType.Indexed8))
+			if (frames.Any(f => f.Palette == null))
 				throw new InvalidOperationException("All frames must be paletted");

 			var size = new Size(frames[0].Width, frames[0].Height);
--- a/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
+++ b/OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
@@ -142,6 +142,13 @@ namespace OpenRA.Mods.Common.Activities
 			// We don't know where the target actually is, so move to where we last saw it
 			if (useLastVisibleTarget)
 			{
+				// HACK: Bot players ignore the standard visibility checks in target.Recalculate,
+				// which means that targetIsHiddenActor is always false, allowing lastVisibleMaximumRange
+				// to be assigned zero range by attackAircraft.GetMaximumRangeVersusTarget for e.g. cloaked actors.
+				// Catch and cancel this edge case to avoid the aircraft stopping mid-air!
+				if (self.Owner.IsBot && lastVisibleMaximumRange == WDist.Zero)
+					return true;
+
 				// We've reached the assumed position but it is not there - give up
 				if (checkTarget.IsInRange(pos, lastVisibleMaximumRange))
 					return true;
--- a/OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs
+++ b/OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs
@@ -89,6 +89,9 @@ namespace OpenRA.Mods.Common.Widgets

 			var tile = world.Map.Tiles[cell];
 			var tileInfo = world.Map.Rules.TileSet.GetTileInfo(tile);
+			if (tileInfo == null)
+				return false;
+
 			var terrainType = world.Map.Rules.TileSet.TerrainInfo[tileInfo.TerrainType];

 			if (mapResources[cell].Type == ResourceType.ResourceType)
--- a/OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
+++ b/OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
@@ -72,8 +72,7 @@ namespace OpenRA.Mods.Common.Effects
 				return;

 			var exit = building.NearestExitOrDefault(targetLineNodes[0]);
-			var exitPos = exit != null ? building.World.Map.CenterOfCell(building.Location + exit.Info.ExitCell) : building.CenterPosition;
-			targetLineNodes.Insert(0, exitPos);
+			targetLineNodes.Insert(0, building.CenterPosition + (exit?.Info.SpawnOffset ?? WVec.Zero));
 		}

 		IEnumerable<IRenderable> IEffect.Render(WorldRenderer wr) { return SpriteRenderable.None; }
--- a/OpenRA.Mods.Common/FileFormats/VqaReader.cs
+++ b/OpenRA.Mods.Common/FileFormats/VqaReader.cs
@@ -319,7 +319,7 @@ namespace OpenRA.Mods.Common.FileFormats
 			// Annoyingly, the complete table is not applied until the frame
 			// *after* the one that contains the 8th chunk.
 			// Do we have a set of partial lookup tables ready to apply?
-			if (currentChunkBuffer == chunkBufferParts)
+			if (currentChunkBuffer == chunkBufferParts && chunkBufferParts != 0)
 			{
 				if (!cbpIsCompressed)
 					cbf = (byte[])cbp.Clone();
--- a/OpenRA.Mods.Common/Lint/CheckMapTiles.cs
+++ b/OpenRA.Mods.Common/Lint/CheckMapTiles.cs
@@ -1,25 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using System;
-using System.Linq;
-
-namespace OpenRA.Mods.Common.Lint
-{
-	public class CheckMapTiles : ILintMapPass
-	{
-		public void Run(Action<string> emitError, Action<string> emitWarning, ModData modData, Map map)
-		{
-			foreach (var kv in map.ReplacedInvalidTerrainTiles)
-				emitError("Cell {0} references invalid terrain tile {1}.".F(kv.Key, kv.Value));
-		}
-	}
-}
--- a/OpenRA.Mods.Common/Lint/CheckPlayers.cs
+++ b/OpenRA.Mods.Common/Lint/CheckPlayers.cs
@@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Lint
 				if (!string.IsNullOrWhiteSpace(player.Faction) && !factions.Contains(player.Faction))
 					emitError("Invalid faction {0} chosen for player {1}.".F(player.Faction, player.Name));

-			if (worldActor.HasTraitInfo<MapStartingLocationsInfo>())
+			if (worldActor.HasTraitInfo<MPStartLocationsInfo>())
 			{
 				var playerCount = players.Count(p => p.Value.Playable);
 				var spawns = new List<CPos>();
--- a/OpenRA.Mods.Common/LoadScreens/BlankLoadScreen.cs
+++ b/OpenRA.Mods.Common/LoadScreens/BlankLoadScreen.cs
@@ -24,8 +24,6 @@ namespace OpenRA.Mods.Common.LoadScreens
 		public LaunchArguments Launch;
 		protected ModData ModData { get; private set; }

-		bool initialized;
-
 		public virtual void Init(ModData modData, Dictionary<string, string> info)
 		{
 			ModData = modData;
@@ -33,15 +31,12 @@ namespace OpenRA.Mods.Common.LoadScreens

 		public virtual void Display()
 		{
-			if (Game.Renderer == null || initialized)
+			if (Game.Renderer == null)
 				return;

 			// Draw a black screen
 			Game.Renderer.BeginUI();
 			Game.Renderer.EndFrame(new NullInputHandler());
-
-			// PERF: draw the screen only once
-			initialized = true;
 		}

 		public virtual void StartGame(Arguments args)
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Optimize>true</Optimize>
    <LangVersion>7.3</LangVersion>
@@ -11,7 +11,6 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
    <CodeAnalysisRuleSet>..\OpenRA.ruleset</CodeAnalysisRuleSet>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
  </PropertyGroup>
  <ItemGroup>
    <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
@@ -25,7 +24,6 @@
    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
      <Private>False</Private>
    </ProjectReference>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
    <PackageReference Include="OpenRA-FuzzyLogicLibrary" Version="1.0.1" />
    <PackageReference Include="DiscordRichPresence" Version="1.0.150" />
    <PackageReference Include="rix0rrr.BeaconLib" Version="1.0.2" />
--- a/OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs
+++ b/OpenRA.Mods.Common/Scripting/Global/MapGlobal.cs
@@ -21,12 +21,14 @@ namespace OpenRA.Mods.Common.Scripting
 	{
 		readonly SpawnMapActors sma;
 		readonly World world;
+		readonly GameSettings gameSettings;

 		public MapGlobal(ScriptContext context)
 			: base(context)
 		{
 			sma = context.World.WorldActor.Trait<SpawnMapActors>();
 			world = context.World;
+			gameSettings = Game.Settings.Game;

 			// Register map actors as globals (yuck!)
 			foreach (var kv in sma.Actors)
@@ -109,6 +111,9 @@ namespace OpenRA.Mods.Common.Scripting
 		[Desc("Returns true if there is only one human player.")]
 		public bool IsSinglePlayer { get { return Context.World.LobbyInfo.NonBotPlayers.Count() == 1; } }

+		[Desc("Returns true if this is a shellmap and the player has paused animations.")]
+		public bool IsPausedShellmap { get { return Context.World.Type == WorldType.Shellmap && gameSettings.PauseShellmap; } }
+
 		[Desc("Returns the value of a `ScriptLobbyDropdown` selected in the game lobby.")]
 		public LuaValue LobbyOption(string id)
 		{
--- a/OpenRA.Mods.Common/Scripting/Properties/HealthProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/HealthProperties.cs
@@ -9,6 +9,8 @@
 */
 #endregion

+using Eluant;
+using OpenRA.Primitives;
 using OpenRA.Scripting;
 using OpenRA.Traits;

@@ -34,10 +36,18 @@ namespace OpenRA.Mods.Common.Scripting
 		[Desc("Maximum health of the actor.")]
 		public int MaxHealth { get { return health.MaxHP; } }

-		[Desc("Kill the actor.")]
-		public void Kill()
+		[Desc("Kill the actor. damageTypes may be omitted, specified as a string, or as table of strings.")]
+		public void Kill(object damageTypes = null)
 		{
-			health.InflictDamage(Self, Self, new Damage(health.MaxHP), true);
+			Damage damage;
+			if (damageTypes is string d)
+				damage = new Damage(health.MaxHP, new BitSet<DamageType>(new[] { d }));
+			else if (damageTypes is LuaTable t && t.TryGetClrValue(out string[] ds))
+				damage = new Damage(health.MaxHP, new BitSet<DamageType>(ds));
+			else
+				damage = new Damage(health.MaxHP);
+
+			health.InflictDamage(Self, Self, damage, true);
 		}
 	}
 }
--- a/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs
@@ -52,6 +52,16 @@ namespace OpenRA.Mods.Common.Scripting
 			}
 		}

+		[Desc("The player's handicap level.")]
+		public int Handicap
+		{
+			get
+			{
+				var c = Player.World.LobbyInfo.Clients.FirstOrDefault(i => i.Index == Player.ClientIndex);
+				return c?.Handicap ?? 0;
+			}
+		}
+
 		[Desc("Returns true if the player is a bot.")]
 		public bool IsBot { get { return Player.IsBot; } }

--- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -43,6 +43,7 @@ namespace OpenRA.Mods.Common.Server
 			{ "name", Name },
 			{ "faction", Faction },
 			{ "team", Team },
+			{ "handicap", Handicap },
 			{ "spawn", Spawn },
 			{ "clear_spawn", ClearPlayerSpawn },
 			{ "color", PlayerColor },
@@ -245,6 +246,7 @@ namespace OpenRA.Mods.Common.Server
 					client.Slot = null;
 					client.SpawnPoint = 0;
 					client.Team = 0;
+					client.Handicap = 0;
 					client.Color = Color.White;
 					server.SyncLobbyClients();
 					CheckAutoStart(server);
@@ -377,6 +379,7 @@ namespace OpenRA.Mods.Common.Server
 						Faction = "Random",
 						SpawnPoint = 0,
 						Team = 0,
+						Handicap = 0,
 						State = Session.ClientState.NotReady,
 						BotControllerClientIndex = controllerClientIndex
 					};
@@ -736,6 +739,7 @@ namespace OpenRA.Mods.Common.Server
 				targetClient.Slot = null;
 				targetClient.SpawnPoint = 0;
 				targetClient.Team = 0;
+				targetClient.Handicap = 0;
 				targetClient.Color = Color.White;
 				targetClient.State = Session.ClientState.NotReady;
 				server.SendMessage("{0} moved {1} to spectators.".F(client.Name, targetClient.Name));
@@ -824,6 +828,42 @@ namespace OpenRA.Mods.Common.Server
 			}
 		}

+		static bool Handicap(S server, Connection conn, Session.Client client, string s)
+		{
+			lock (server.LobbyInfo)
+			{
+				var parts = s.Split(' ');
+				var targetClient = server.LobbyInfo.ClientWithIndex(Exts.ParseIntegerInvariant(parts[0]));
+
+				// Only the host can change other client's info
+				if (targetClient.Index != client.Index && !client.IsAdmin)
+					return true;
+
+				// Map has disabled handicap changes
+				if (server.LobbyInfo.Slots[targetClient.Slot].LockHandicap)
+					return true;
+
+				if (!Exts.TryParseIntegerInvariant(parts[1], out var handicap))
+				{
+					Log.Write("server", "Invalid handicap: {0}", s);
+					return false;
+				}
+
+				// Handicaps may be set between 0 - 95% in steps of 5%
+				var options = Enumerable.Range(0, 20).Select(i => 5 * i);
+				if (!options.Contains(handicap))
+				{
+					Log.Write("server", "Invalid handicap: {0}", s);
+					return false;
+				}
+
+				targetClient.Handicap = handicap;
+				server.SyncLobbyClients();
+
+				return true;
+			}
+		}
+
 		static bool ClearPlayerSpawn(S server, Connection conn, Session.Client client, string s)
 		{
 			var spawnPoint = Exts.ParseIntegerInvariant(s);
@@ -1003,6 +1043,7 @@ namespace OpenRA.Mods.Common.Server
 				LockFaction = pr.LockFaction,
 				LockColor = pr.LockColor,
 				LockTeam = pr.LockTeam,
+				LockHandicap = pr.LockHandicap,
 				LockSpawn = pr.LockSpawn,
 				Required = pr.Required,
 			};
--- a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
@@ -22,9 +22,6 @@ namespace OpenRA.Mods.Common.Server
 		{
 			lock (server.LobbyInfo)
 			{
-				if (server.LobbyInfo.ClientWithIndex(conn.PlayerIndex).IsAdmin)
-					return;
-
 				var defaults = new Session.Global();
 				LobbyCommands.LoadMapSettings(server, defaults, server.Map.Rules);

--- a/OpenRA.Mods.Common/ServerTraits/MasterServerPinger.cs
+++ b/OpenRA.Mods.Common/ServerTraits/MasterServerPinger.cs
@@ -13,7 +13,6 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using BeaconLib;
 using OpenRA.Network;
 using OpenRA.Server;
@@ -108,7 +107,7 @@ namespace OpenRA.Mods.Common.Server
 		{
 			isBusy = true;

-			Task.Run(() =>
+			Action a = () =>
 			{
 				try
 				{
@@ -161,7 +160,9 @@ namespace OpenRA.Mods.Common.Server
 				}

 				isBusy = false;
-			});
+			};
+
+			a.BeginInvoke(null, null);
 		}
 	}
 }
--- a/OpenRA.Mods.Common/SpriteLoaders/PngSheetLoader.cs
+++ b/OpenRA.Mods.Common/SpriteLoaders/PngSheetLoader.cs
@@ -61,22 +61,24 @@ namespace OpenRA.Mods.Common.SpriteLoaders
 				RegionsFromSlices(png, out frameRegions, out frameOffsets);

 			frames = new ISpriteFrame[frameRegions.Count];
-			var stride = png.PixelStride;
+
 			for (var i = 0; i < frames.Length; i++)
 			{
 				var frameStart = frameRegions[i].X + frameRegions[i].Y * png.Width;
 				var frameSize = new Size(frameRegions[i].Width, frameRegions[i].Height);
+				var pixelLength = png.Palette == null ? 4 : 1;
+
 				frames[i] = new PngSheetFrame()
 				{
 					Size = frameSize,
 					FrameSize = frameSize,
 					Offset = frameOffsets[i],
-					Data = new byte[frameRegions[i].Width * frameRegions[i].Height * stride],
-					Type = png.Type
+					Data = new byte[frameRegions[i].Width * frameRegions[i].Height * pixelLength],
+					Type = png.Palette == null ? SpriteFrameType.BGRA : SpriteFrameType.Indexed
 				};

 				for (var y = 0; y < frames[i].Size.Height; y++)
-					Array.Copy(png.Data, (frameStart + y * png.Width) * stride, frames[i].Data, y * frames[i].Size.Width * stride, frames[i].Size.Width * stride);
+					Array.Copy(png.Data, (frameStart + y * png.Width) * pixelLength, frames[i].Data, y * frames[i].Size.Width * pixelLength, frames[i].Size.Width * pixelLength);
 			}

 			metadata = new TypeDictionary
--- a/OpenRA.Mods.Common/SpriteLoaders/ShpTSLoader.cs
+++ b/OpenRA.Mods.Common/SpriteLoaders/ShpTSLoader.cs
@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.SpriteLoaders
 	{
 		class ShpTSFrame : ISpriteFrame
 		{
-			public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
+			public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
 			public Size Size { get; private set; }
 			public Size FrameSize { get; private set; }
 			public float2 Offset { get; private set; }
--- a/OpenRA.Mods.Common/Traits/AutoTarget.cs
+++ b/OpenRA.Mods.Common/Traits/AutoTarget.cs
@@ -348,8 +348,11 @@ namespace OpenRA.Mods.Common.Traits
 				return chosenTarget;

 			var targetsInRange = self.World.FindActorsInCircle(self.CenterPosition, scanRange)
-				.Select(Target.FromActor)
-				.Concat(self.Owner.FrozenActorLayer.FrozenActorsInCircle(self.World, self.CenterPosition, scanRange)
+				.Select(Target.FromActor);
+
+			if (allowMove || ab.Info.TargetFrozenActors)
+				targetsInRange = targetsInRange
+					.Concat(self.Owner.FrozenActorLayer.FrozenActorsInCircle(self.World, self.CenterPosition, scanRange)
 					.Select(Target.FromFrozenActor));

 			foreach (var target in targetsInRange)
--- a/OpenRA.Mods.Common/Traits/BotModules/Squads/States/GroundStates.cs
+++ b/OpenRA.Mods.Common/Traits/BotModules/Squads/States/GroundStates.cs
@@ -53,8 +53,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads

 			if (AttackOrFleeFuzzy.Default.CanAttack(owner.Units, enemyUnits))
 			{
-				foreach (var u in owner.Units)
-					owner.Bot.QueueOrder(new Order("AttackMove", u, Target.FromCell(owner.World, owner.TargetActor.Location), false));
+				owner.Bot.QueueOrder(new Order("AttackMove", null, Target.FromCell(owner.World, owner.TargetActor.Location), false, groupedActors: owner.Units.ToArray()));

 				// We have gathered sufficient units. Attack the nearest enemy unit.
 				owner.FuzzyStateMachine.ChangeState(owner, new GroundUnitsAttackMoveState(), true);
@@ -124,8 +123,9 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
 				// Since units have different movement speeds, they get separated while approaching the target.
 				// Let them regroup into tighter formation.
 				owner.Bot.QueueOrder(new Order("Stop", leader, false));
-				foreach (var unit in owner.Units.Where(a => !ownUnits.Contains(a)))
-					owner.Bot.QueueOrder(new Order("AttackMove", unit, Target.FromCell(owner.World, leader.Location), false));
+
+				var units = owner.Units.Where(a => !ownUnits.Contains(a)).ToArray();
+				owner.Bot.QueueOrder(new Order("AttackMove", null, Target.FromCell(owner.World, leader.Location), false, groupedActors: units));
 			}
 			else
 			{
@@ -138,8 +138,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
 					owner.FuzzyStateMachine.ChangeState(owner, new GroundUnitsAttackState(), true);
 				}
 				else
-					foreach (var a in owner.Units)
-						owner.Bot.QueueOrder(new Order("AttackMove", a, Target.FromCell(owner.World, owner.TargetActor.Location), false));
+					owner.Bot.QueueOrder(new Order("AttackMove", null, Target.FromCell(owner.World, owner.TargetActor.Location), false, groupedActors: owner.Units.ToArray()));
 			}

 			if (ShouldFlee(owner))
--- a/OpenRA.Mods.Common/Traits/BotModules/Squads/States/NavyStates.cs
+++ b/OpenRA.Mods.Common/Traits/BotModules/Squads/States/NavyStates.cs
@@ -78,8 +78,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads

 			if (AttackOrFleeFuzzy.Default.CanAttack(owner.Units, enemyUnits))
 			{
-				foreach (var u in owner.Units)
-					owner.Bot.QueueOrder(new Order("AttackMove", u, Target.FromCell(owner.World, owner.TargetActor.Location), false));
+				owner.Bot.QueueOrder(new Order("AttackMove", null, Target.FromCell(owner.World, owner.TargetActor.Location), false, groupedActors: owner.Units.ToArray()));

 				// We have gathered sufficient units. Attack the nearest enemy unit.
 				owner.FuzzyStateMachine.ChangeState(owner, new NavyUnitsAttackMoveState(), true);
@@ -149,8 +148,9 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
 				// Since units have different movement speeds, they get separated while approaching the target.
 				// Let them regroup into tighter formation.
 				owner.Bot.QueueOrder(new Order("Stop", leader, false));
-				foreach (var unit in owner.Units.Where(a => !ownUnits.Contains(a)))
-					owner.Bot.QueueOrder(new Order("AttackMove", unit, Target.FromCell(owner.World, leader.Location), false));
+
+				var units = owner.Units.Where(a => !ownUnits.Contains(a)).ToArray();
+				owner.Bot.QueueOrder(new Order("AttackMove", null, Target.FromCell(owner.World, leader.Location), false, groupedActors: units));
 			}
 			else
 			{
@@ -163,8 +163,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
 					owner.FuzzyStateMachine.ChangeState(owner, new NavyUnitsAttackState(), true);
 				}
 				else
-					foreach (var a in owner.Units)
-						owner.Bot.QueueOrder(new Order("AttackMove", a, Target.FromCell(owner.World, owner.TargetActor.Location), false));
+					owner.Bot.QueueOrder(new Order("AttackMove", null, Target.FromCell(owner.World, owner.TargetActor.Location), false, groupedActors: owner.Units.ToArray()));
 			}

 			if (ShouldFlee(owner))
--- a/OpenRA.Mods.Common/Traits/BotModules/Squads/States/ProtectionStates.cs
+++ b/OpenRA.Mods.Common/Traits/BotModules/Squads/States/ProtectionStates.cs
@@ -55,10 +55,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
 				Backoff--;
 			}
 			else
-			{
-				foreach (var a in owner.Units)
-					owner.Bot.QueueOrder(new Order("AttackMove", a, Target.FromCell(owner.World, owner.TargetActor.Location), false));
-			}
+				owner.Bot.QueueOrder(new Order("AttackMove", null, Target.FromCell(owner.World, owner.TargetActor.Location), false, groupedActors: owner.Units.ToArray()));
 		}

 		public void Deactivate(Squad owner) { }
--- a/OpenRA.Mods.Common/Traits/Buildable.cs
+++ b/OpenRA.Mods.Common/Traits/Buildable.cs
@@ -54,6 +54,7 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Sort order for the production palette. Smaller numbers are presented earlier.")]
 		public readonly int BuildPaletteOrder = 9999;

+		[Translate]
 		[Desc("Text shown in the production tooltip.")]
 		public readonly string Description = "";

--- a/OpenRA.Mods.Common/Traits/Buildings/Exit.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/Exit.cs
@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits
 			// This is important because p may have side-effects that trigger a desync if not
 			// called on the same exits in the same order!
 			var all = Exits(actor, productionType)
-				.OrderBy(e => e.Info.Priority)
+				.OrderByDescending(e => e.Info.Priority)
 				.ThenBy(e => (actor.World.Map.CenterOfCell(actor.Location + e.Info.ExitCell) - pos).LengthSquared)
 				.ToList();

--- a/OpenRA.Mods.Common/Traits/Multipliers/HandicapDamageMultiplier.cs
+++ b/OpenRA.Mods.Common/Traits/Multipliers/HandicapDamageMultiplier.cs
@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Modifies the damage applied to this actor based on the owner's handicap.")]
+	public class HandicapDamageMultiplierInfo : TraitInfo
+	{
+		public override object Create(ActorInitializer init) { return new HandicapDamageMultiplier(init.Self); }
+	}
+
+	public class HandicapDamageMultiplier : IDamageModifier
+	{
+		readonly Actor self;
+
+		public HandicapDamageMultiplier(Actor self)
+		{
+			this.self = self;
+		}
+
+		int IDamageModifier.GetDamageModifier(Actor attacker, Damage damage)
+		{
+			// Equivalent to the health handicap from C&C3:
+			//  5% handicap = 95% health = 105% damage
+			// 50% handicap = 50% health = 200% damage
+			// 95% handicap = 5% health = 2000% damage
+			return 10000 / (100 - self.Owner.Handicap);
+		}
+	}
+}
--- a/OpenRA.Mods.Common/Traits/Multipliers/HandicapFirepowerMultiplier.cs
+++ b/OpenRA.Mods.Common/Traits/Multipliers/HandicapFirepowerMultiplier.cs
@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Modifies the damage applied by this actor based on the owner's handicap.")]
+	public class HandicapFirepowerMultiplierInfo : TraitInfo
+	{
+		public override object Create(ActorInitializer init) { return new HandicapFirepowerMultiplier(init.Self); }
+	}
+
+	public class HandicapFirepowerMultiplier : IFirepowerModifier
+	{
+		readonly Actor self;
+
+		public HandicapFirepowerMultiplier(Actor self)
+		{
+			this.self = self;
+		}
+
+		int IFirepowerModifier.GetFirepowerModifier()
+		{
+			// Equivalent to the firepower handicap from C&C3:
+			//  5% handicap = 95% firepower
+			// 50% handicap = 50% firepower
+			// 95% handicap = 5% firepower
+			return 100 - self.Owner.Handicap;
+		}
+	}
+}
--- a/OpenRA.Mods.Common/Traits/Multipliers/HandicapProductionTimeMultiplier.cs
+++ b/OpenRA.Mods.Common/Traits/Multipliers/HandicapProductionTimeMultiplier.cs
@@ -0,0 +1,32 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Modifies the production time of this actor based on the producer's handicap.")]
+	public class HandicapProductionTimeMultiplierInfo : TraitInfo<HandicapProductionTimeMultiplier>, IProductionTimeModifierInfo
+	{
+		int IProductionTimeModifierInfo.GetProductionTimeModifier(TechTree techTree, string queue)
+		{
+			// Equivalent to the build speed handicap from C&C3:
+			//  5% handicap = 105% build time
+			// 50% handicap = 150% build time
+			// 95% handicap = 195% build time
+			return 100 + techTree.Owner.Handicap;
+		}
+	}
+
+	public class HandicapProductionTimeMultiplier { }
+}
--- a/OpenRA.Mods.Common/Traits/Player/ConquestVictoryConditions.cs
+++ b/OpenRA.Mods.Common/Traits/Player/ConquestVictoryConditions.cs
@@ -21,6 +21,7 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Delay for the end game notification in milliseconds.")]
 		public readonly int NotificationDelay = 1500;

+		[Translate]
 		[Desc("Description of the objective.")]
 		public readonly string Objective = "Destroy all opposition!";

--- a/OpenRA.Mods.Common/Traits/Player/DeveloperMode.cs
+++ b/OpenRA.Mods.Common/Traits/Player/DeveloperMode.cs
@@ -19,9 +19,11 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Attach this to the player actor.")]
 	public class DeveloperModeInfo : TraitInfo, ILobbyOptions
 	{
+		[Translate]
 		[Desc("Descriptive label for the developer mode checkbox in the lobby.")]
 		public readonly string CheckboxLabel = "Debug Menu";

+		[Translate]
 		[Desc("Tooltip description for the developer mode checkbox in the lobby.")]
 		public readonly string CheckboxDescription = "Enables cheats and developer commands";

--- a/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
+++ b/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
@@ -18,9 +18,11 @@ namespace OpenRA.Mods.Common.Traits
 {
 	public class PlayerResourcesInfo : TraitInfo, ILobbyOptions
 	{
+		[Translate]
 		[Desc("Descriptive label for the starting cash option in the lobby.")]
 		public readonly string DefaultCashDropdownLabel = "Starting Cash";

+		[Translate]
 		[Desc("Tooltip description for the starting cash option in the lobby.")]
 		public readonly string DefaultCashDropdownDescription = "Change the amount of cash that players start with";

--- a/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
@@ -412,8 +412,11 @@ namespace OpenRA.Mods.Common.Traits
 						var hasPlayedSound = false;
 						BeginProduction(new ProductionItem(this, order.TargetString, cost, playerPower, () => self.World.AddFrameEndTask(_ =>
 						{
-							var isBuilding = unit.HasTraitInfo<BuildingInfo>();
+							// Make sure the item hasn't been invalidated between the ProductionItem ticking and this FrameEndTask running
+							if (!Queue.Any(i => i.Done && i.Item == unit.Name))
+								return;

+							var isBuilding = unit.HasTraitInfo<BuildingInfo>();
 							if (isBuilding && !hasPlayedSound)
 								hasPlayedSound = Game.Sound.PlayNotification(rules, self.Owner, "Speech", Info.ReadyAudio, self.Owner.Faction.InternalName);
 							else if (!isBuilding)
--- a/OpenRA.Mods.Common/Traits/Player/ProvidesTechPrerequisite.cs
+++ b/OpenRA.Mods.Common/Traits/Player/ProvidesTechPrerequisite.cs
@@ -19,6 +19,7 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Internal id for this tech level.")]
 		public readonly string Id;

+		[Translate]
 		[Desc("Name shown in the lobby options.")]
 		public readonly string Name;

--- a/OpenRA.Mods.Common/Traits/Player/StrategicVictoryConditions.cs
+++ b/OpenRA.Mods.Common/Traits/Player/StrategicVictoryConditions.cs
@@ -36,6 +36,7 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Delay for the end game notification in milliseconds.")]
 		public readonly int NotificationDelay = 1500;

+		[Translate]
 		[Desc("Description of the objective")]
 		public readonly string Objective = "Hold all the strategic positions!";

--- a/OpenRA.Mods.Common/Traits/Player/TechTree.cs
+++ b/OpenRA.Mods.Common/Traits/Player/TechTree.cs
@@ -106,6 +106,8 @@ namespace OpenRA.Mods.Common.Traits
 			return ret;
 		}

+		public Player Owner { get { return player; } }
+
 		class Watcher
 		{
 			public readonly string Key;
--- a/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
@@ -29,8 +29,10 @@ namespace OpenRA.Mods.Common.Traits.Render
 		public readonly string DefaultAttackSequence = null;

 		[SequenceReference(dictionaryReference: LintDictionaryReference.Values)]
-		[Desc("Attack sequence to use for each armament.")]
-		public readonly Dictionary<string, string> AttackSequences = new Dictionary<string, string>();
+		[Desc("Attack sequence to use for each armament.",
+			"A dictionary of [armament name]: [sequence name(s)].",
+			"Multiple sequence names can be defined to specify per-burst animations.")]
+		public readonly Dictionary<string, string[]> AttackSequences = new Dictionary<string, string[]>();

 		[SequenceReference]
 		public readonly string[] IdleSequences = { };
@@ -133,11 +135,21 @@ namespace OpenRA.Mods.Common.Traits.Render
 			}
 		}

-		public void Attacking(Actor self, in Target target, Armament a)
+		void Attacking(Actor self, Armament a, Barrel barrel)
 		{
 			var info = GetDisplayInfo();
-			if (!info.AttackSequences.TryGetValue(a.Info.Name, out var sequence))
-				sequence = info.DefaultAttackSequence;
+			var sequence = info.DefaultAttackSequence;
+
+			if (info.AttackSequences.TryGetValue(a.Info.Name, out var sequences) && sequences.Length > 0)
+			{
+				sequence = sequences[0];
+
+				// Find the sequence corresponding to this barrel/burst.
+				if (barrel != null && sequences.Length > 1)
+					for (var i = 0; i < sequences.Length; i++)
+						if (a.Barrels[i] == barrel)
+							sequence = sequences[i];
+			}

 			if (!string.IsNullOrEmpty(sequence) && DefaultAnimation.HasSequence(NormalizeInfantrySequence(self, sequence)))
 			{
@@ -148,12 +160,9 @@ namespace OpenRA.Mods.Common.Traits.Render

 		void INotifyAttack.PreparingAttack(Actor self, in Target target, Armament a, Barrel barrel)
 		{
-			// Lambdas can't use 'in' variables, so capture a copy for later
-			var attackTarget = target;
-
 			// HACK: The FrameEndTask makes sure that this runs after Tick(), preventing that from
 			// overriding the animation when an infantry unit stops to attack
-			self.World.AddFrameEndTask(_ => Attacking(self, attackTarget, a));
+			self.World.AddFrameEndTask(_ => Attacking(self, a, barrel));
 		}

 		void INotifyAttack.Attacking(Actor self, in Target target, Armament a, Barrel barrel) { }
--- a/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs
@@ -21,6 +21,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 	[Desc("Displays a text overlay relative to the selection box.")]
 	public class WithTextDecorationInfo : WithDecorationBaseInfo
 	{
+		[Translate]
 		[FieldLoader.Require]
 		public readonly string Text = null;

--- a/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs
@@ -137,7 +137,7 @@ namespace OpenRA.Mods.Common.Traits
 			protected override void Tick(World world)
 			{
 				// Cancel the OG if we can't use the power
-				if (!manager.Powers.ContainsKey(order))
+				if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
 					world.CancelInputMode();
 			}

--- a/OpenRA.Mods.Common/Traits/SupportPowers/SelectDirectionalTarget.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/SelectDirectionalTarget.cs
@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.Traits
 		void IOrderGenerator.Tick(World world)
 		{
 			// Cancel the OG if we can't use the power
-			if (!manager.Powers.ContainsKey(order))
+			if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
 				world.CancelInputMode();
 		}

--- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
@@ -309,7 +309,7 @@ namespace OpenRA.Mods.Common.Traits
 		protected override void Tick(World world)
 		{
 			// Cancel the OG if we can't use the power
-			if (!manager.Powers.ContainsKey(order))
+			if (!manager.Powers.TryGetValue(order, out var p) || !p.Active || !p.Ready)
 				world.CancelInputMode();
 		}

--- a/OpenRA.Mods.Common/Traits/Tooltip.cs
+++ b/OpenRA.Mods.Common/Traits/Tooltip.cs
@@ -15,6 +15,7 @@ namespace OpenRA.Mods.Common.Traits
 {
 	public abstract class TooltipInfoBase : ConditionalTraitInfo, Requires<IMouseBoundsInfo>
 	{
+		[Translate]
 		public readonly string Name = "";
 	}

@@ -27,6 +28,7 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Shown in the build palette widget.")]
 	public class TooltipInfo : TooltipInfoBase, ITooltipInfo
 	{
+		[Translate]
 		[Desc("An optional generic name (i.e. \"Soldier\" or \"Structure\")" +
 			"to be shown to chosen players.")]
 		public readonly string GenericName = null;
@@ -34,12 +36,15 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Prefix generic tooltip name with 'Ally/Neutral/EnemyPrefix'.")]
 		public readonly bool GenericStancePrefix = true;

+		[Translate]
 		[Desc("Prefix to display in the tooltip for allied units.")]
 		public readonly string AllyPrefix = "Allied";

+		[Translate]
 		[Desc("Prefix to display in the tooltip for neutral units.")]
 		public readonly string NeutralPrefix = null;

+		[Translate]
 		[Desc("Prefix to display in the tooltip for enemy units.")]
 		public readonly string EnemyPrefix = "Enemy";

--- a/OpenRA.Mods.Common/Traits/TooltipDescription.cs
+++ b/OpenRA.Mods.Common/Traits/TooltipDescription.cs
@@ -17,6 +17,7 @@ namespace OpenRA.Mods.Common.Traits
 	public class TooltipDescriptionInfo : ConditionalTraitInfo
 	{
 		[Desc("Text shown in tooltip.")]
+		[Translate]
 		public readonly string Description = "";

 		[Desc("Player relationships who can view the description.")]
--- a/OpenRA.Mods.Common/Traits/World/ActorSpawnManager.cs
+++ b/OpenRA.Mods.Common/Traits/World/ActorSpawnManager.cs
@@ -11,7 +11,6 @@

 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common;
 using OpenRA.Primitives;
 using OpenRA.Traits;

@@ -26,8 +25,8 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Maximum number of actors.")]
 		public readonly int Maximum = 4;

-		[Desc("Time (in ticks) between actor spawn. Supports 1 or 2 values.\nIf 2 values are provided they are used as a range from which a value is randomly selected.")]
-		public readonly int[] SpawnInterval = { 6000 };
+		[Desc("Time (in ticks) between actor spawn.")]
+		public readonly int SpawnInterval = 6000;

 		[FieldLoader.Require]
 		[ActorReference]
@@ -39,20 +38,6 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Type of ActorSpawner with which it connects.")]
 		public readonly HashSet<string> Types = new HashSet<string>() { };

-		public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
-		{
-			base.RulesetLoaded(rules, ai);
-
-			if (SpawnInterval.Length == 0 || SpawnInterval.Length > 2)
-				throw new YamlException("{0}.{1} must be either 1 or 2 values".F(nameof(ActorSpawnManager), nameof(SpawnInterval)));
-
-			if (SpawnInterval.Length == 2 && SpawnInterval[0] >= SpawnInterval[1])
-				throw new YamlException("{0}.{1}'s first value must be less than the second value".F(nameof(ActorSpawnManager), nameof(SpawnInterval)));
-
-			if (SpawnInterval.Any(it => it < 0))
-				throw new YamlException("{0}.{1}'s value(s) must not be less than 0".F(nameof(ActorSpawnManager), nameof(SpawnInterval)));
-		}
-
 		public override object Create(ActorInitializer init) { return new ActorSpawnManager(init.Self, this); }
 	}

@@ -92,7 +77,7 @@ namespace OpenRA.Mods.Common.Traits
 			if (spawnPoint == null)
 				return;

-			spawnCountdown = Util.RandomDelay(self.World, info.SpawnInterval);
+			spawnCountdown = info.SpawnInterval;

 			do
 			{
--- a/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs
+++ b/OpenRA.Mods.Common/Traits/World/CrateSpawner.cs
@@ -20,9 +20,11 @@ namespace OpenRA.Mods.Common.Traits
 {
 	public class CrateSpawnerInfo : TraitInfo, ILobbyOptions
 	{
+		[Translate]
 		[Desc("Descriptive label for the crates checkbox in the lobby.")]
 		public readonly string CheckboxLabel = "Crates";

+		[Translate]
 		[Desc("Tooltip description for the crates checkbox in the lobby.")]
 		public readonly string CheckboxDescription = "Collect crates with units to receive random bonuses or penalties";

--- a/OpenRA.Mods.Common/Traits/World/CreateMapPlayers.cs
+++ b/OpenRA.Mods.Common/Traits/World/CreateMapPlayers.cs
@@ -19,7 +19,7 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the world actor.")]
-	public class CreateMapPlayersInfo : TraitInfo<CreateMapPlayers>, ICreatePlayersInfo
+	public class CreateMPPlayersInfo : TraitInfo<CreateMPPlayers>, ICreatePlayersInfo
 	{
 		/// <summary>
 		/// Returns a list of GameInformation.Players that matches the indexing of ICreatePlayers.CreatePlayers.
@@ -64,6 +64,7 @@ namespace OpenRA.Mods.Common.Traits
 					DisplayFactionId = clientFaction.InternalName,
 					Color = client.Color,
 					Team = client.Team,
+					Handicap = client.Handicap,
 					SpawnPoint = resolvedSpawnPoint,
 					IsRandomFaction = clientFaction.RandomFactionMembers.Any(),
 					IsRandomSpawnPoint = client.SpawnPoint == 0,
@@ -80,7 +81,7 @@ namespace OpenRA.Mods.Common.Traits
 		}
 	}

-	public class CreateMapPlayers : ICreatePlayers
+	public class CreateMPPlayers : ICreatePlayers
 	{
 		void ICreatePlayers.CreatePlayers(World w, MersenneTwister playerRandom)
 		{
--- a/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
+++ b/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
@@ -214,6 +214,10 @@ namespace OpenRA.Mods.Common.Traits
 				if (factionInit != null && factionInit.Value == Owner.Faction)
 					return false;

+				var healthInit = init as HealthInit;
+				if (healthInit != null && healthInit.Value == 100)
+					return false;
+
 				// TODO: Other default values will need to be filtered
 				// here after we have built a properties panel
 				return true;
--- a/OpenRA.Mods.Common/Traits/World/EditorCursorLayer.cs
+++ b/OpenRA.Mods.Common/Traits/World/EditorCursorLayer.cs
@@ -78,7 +78,10 @@ namespace OpenRA.Mods.Common.Traits
 							for (var x = 0; x < TerrainTemplate.Size.X; x++)
 							{
 								var tile = new TerrainTile(TerrainTemplate.Id, (byte)i++);
-								if (!world.Map.Rules.TileSet.TryGetTileInfo(tile, out var tileInfo))
+								var tileInfo = world.Map.Rules.TileSet.GetTileInfo(tile);
+
+								// Empty tile
+								if (tileInfo == null)
 									continue;

 								var sprite = wr.Theater.TileSprite(tile, 0);
--- a/OpenRA.Mods.Common/Traits/World/MapStartingLocations.cs
+++ b/OpenRA.Mods.Common/Traits/World/MapStartingLocations.cs
@@ -20,13 +20,15 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Allows the map to have working spawnpoints. Also controls the 'Separate Team Spawns' checkbox in the lobby options.")]
-	public class MapStartingLocationsInfo : TraitInfo, ILobbyOptions, IAssignSpawnPointsInfo
+	public class MPStartLocationsInfo : TraitInfo, ILobbyOptions, IAssignSpawnPointsInfo
 	{
 		public readonly WDist InitialExploreRange = WDist.FromCells(5);

+		[Translate]
 		[Desc("Descriptive label for the spawn positions checkbox in the lobby.")]
 		public readonly string SeparateTeamSpawnsCheckboxLabel = "Separate Team Spawns";

+		[Translate]
 		[Desc("Tooltip description for the spawn positions checkbox in the lobby.")]
 		public readonly string SeparateTeamSpawnsCheckboxDescription = "Players without assigned spawn points will start as far as possible from enemy players";

@@ -42,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Display order for the spawn positions checkbox in the lobby.")]
 		public readonly int SeparateTeamSpawnsCheckboxDisplayOrder = 0;

-		public override object Create(ActorInitializer init) { return new MapStartingLocations(this); }
+		public override object Create(ActorInitializer init) { return new MPStartLocations(this); }

 		IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
 		{
@@ -103,15 +105,15 @@ namespace OpenRA.Mods.Common.Traits
 		}
 	}

-	public class MapStartingLocations : IWorldLoaded, INotifyCreated, IAssignSpawnPoints
+	public class MPStartLocations : IWorldLoaded, INotifyCreated, IAssignSpawnPoints
 	{
-		readonly MapStartingLocationsInfo info;
+		readonly MPStartLocationsInfo info;
 		readonly Dictionary<int, Session.Client> occupiedSpawnPoints = new Dictionary<int, Session.Client>();
 		bool separateTeamSpawns;
 		CPos[] spawnLocations;
 		List<int> availableSpawnPoints;

-		public MapStartingLocations(MapStartingLocationsInfo info)
+		public MPStartLocations(MPStartLocationsInfo info)
 		{
 			this.info = info;
 		}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Unrud	b278a63e11	Makefile: Fail target version when not a git repository	2021-03-13 15:58:11 +00:00
Paul Chote	7ba140e471	Fail Situation Critical if Volkov is killed before entering the world.	2021-03-13 15:55:39 +00:00
Paul Chote	df476dd96f	Fix non-relative path handling in install logic.	2021-03-13 15:52:52 +00:00
Paul Chote	f813f2bd46	Fix lobby checkbox event rectangle overlapping with scrollbars.	2021-03-05 18:56:46 +01:00
Paul Chote	c9c24490e6	Fix rendering artifacts with RA's dialog5 background.	2021-03-05 18:36:08 +01:00
penev92	11d84041d9	Added the "missing" song to the D2k TestFiles Since it's music it's optional, so the players still won't know anything happened, but if they do open the content manager they will have a chance for an automatic installation.	2021-02-28 12:29:27 +00:00
pizzaoverhead	7ec9bdf0d0	Fix TLS error on Win7.	2021-02-28 10:15:52 +00:00
penev92	ef59b07a2d	Fixed D2k VQA videos crashing the game	2021-02-19 13:38:23 +01:00
Unrud	74e3ded764	AppStream Metadata: Add violence-worship: moderate	2021-02-14 14:17:22 +00:00
Unrud	a46fab4ece	Update AppStream metadata for linux packaging A few small improvements: * The type `desktop` was renamed to `desktop-appliaction` (a long time ago) * Add `launchable` to tell how the application can be launched * Use `https` for homepage link * Add link to the bugtracker * Update `oars-1.0` to `oars-1.1` * Remove all unnecessary `content_attribute` entries with value `none`	2021-02-14 14:17:16 +00:00
Smittytron	81a7c3446d	Add clarifying objective to Monster Tank Madness	2021-02-12 02:35:42 +01:00
Orb	a3404fac66	APC Balance Tweak Commit	2021-02-09 23:08:55 +01:00
Paul Chote	bb2276498b	Fix Tanya's prone firing animations.	2021-02-02 23:06:27 +01:00
Unrud	7367b546e8	Use version from VERSION file The `VERSION` variable doesn't work with a release tarball, because it requires git to be set correctly. Instead this reads the version from the `VERSION` file.	2021-02-01 23:14:12 +01:00
abcdefg30	becc180956	Increase the reload delay of the prison colt to match the normal colt	2021-01-31 22:36:16 +00:00
abcdefg30	656ce35330	Fix the gun sounds not playing in Allies05a	2021-01-31 22:36:13 +00:00
Smittytron	2575b41492	Fix crash in Allies 05a on SamBarrel kill	2021-01-31 18:53:02 +01:00
abcdefg30	acaf535b67	Remove the 'docs' target from the windows make file	2021-01-30 21:08:59 +00:00
Paul Chote	503a434a4b	Fix Concrete placement on invalid terrain.	2021-01-30 14:48:35 +01:00
Smittytron	e27c093536	Remove SpawnActorOnDeath from civilian structures	2021-01-30 13:50:20 +01:00
Paul Chote	fed7daa03d	Ignore invalid server entries instead of the entire list.	2021-01-30 13:46:22 +01:00
Paul Chote	3906c6efab	Don't crash if a null uid is given to QueryRemoteMapDetails.	2021-01-30 13:46:20 +01:00
Paul Chote	ae018235d0	Prevent AttackPopupTurreted.TickIdle from running while disabled.	2021-01-30 13:16:45 +01:00
Paul Chote	a8f6256c04	Restore missing versioned source code package.	2021-01-30 13:05:54 +01:00
reaperrr	de6a9dc8da	Fix RA inf death anims playing too fast	2021-01-30 01:24:03 +00:00
Paul Chote	f14e3669e3	Fix Tanya firing animation.	2021-01-29 15:03:37 +01:00
Paul Chote	21eb585a28	Support burst-specific infantry attack animations.	2021-01-29 15:03:24 +01:00
Paul Chote	f8dddf0502	Reduce Tanya firing rate.	2021-01-29 15:03:13 +01:00
Paul Chote	d3482c0f18	Suppress error messages from make.ps1 clean. Also removed obsolete ./*/bin removal.	2021-01-29 14:54:15 +01:00
Paul Chote	d1c9b8d30f	Keep Discord join button active for spectators.	2021-01-29 14:39:53 +01:00
Paul Chote	d2a6b7370e	Remove first-client check from LobbySettingsNotification. ClientWithIndex may rarely be null, causing a crash. In any case we do want to report these changes to the first client, as somebody else may have changed the settings and left.	2021-01-29 14:33:56 +01:00
Paul Chote	20b55ab5db	Fix bot-controlled aircraft stalling above cloaked targets.	2021-01-29 14:30:00 +01:00
Paul Chote	c7ffc4d24f	Increase map chooser dialog size to match the lobby.	2021-01-25 20:44:05 +01:00
Smittytron	2ce83bb51f	Change hospital owner in Nod07b	2021-01-24 10:52:52 +00:00
teinarss	ea9f967acd	Add Map and server name to discord details	2021-01-22 14:14:27 +01:00
Paul Chote	4a6927b513	Fix AutoTarget.ChooseTarget ignoring AttackBase.TargetFrozenActors.	2021-01-21 19:25:25 +01:00
Paul Chote	cab611b8dd	Fix `make check` ignoring TARGETPLATFORM override.	2021-01-19 09:34:45 +01:00
Paul Chote	47bfa8bce8	Fix Sardarkaur not attacking while attack-moving.	2021-01-17 19:45:06 +01:00
Matthias Mailänder	40c452b07e	Update path according to latest appstream specifications.	2021-01-16 20:04:15 +01:00
Matthias Mailänder	f1b238d7bf	Document the target platform parameter during install as it otherwise copies the system binaries.	2021-01-16 20:04:13 +01:00
Matthias Mailänder	0028a26193	Get rid of unnecessary Makefile variables.	2021-01-16 20:04:12 +01:00
Matthias Mailänder	bcdbd02f1c	Don't contain the build root in the wrappers.	2021-01-16 20:04:10 +01:00
Matthias Mailänder	805fc5cade	Create BIN_PATH first on shortcut installation.	2021-01-16 20:04:09 +01:00
VonNah	90ddbbc934	Fix vehicle explosion and missile impact sounds in Tiberian Dawn	2021-01-16 01:32:34 +00:00
VonNah	5f9126f274	Fixed an issue where RadarUp and DisablePower/EnablePower use the wrong sound effects. Signed-off-by: VonNah <vonnahora@gmail.com>	2021-01-16 00:48:58 +00:00
Paul Chote	a1011efd98	Update apt metadata before installing dependencies.	2021-01-12 23:11:20 +01:00
Paul Chote	135ee781d4	Fix infantry freezing death animations in Top o' the World mission.	2021-01-11 11:32:50 +01:00
Paul Chote	56ef43145b	Fix Grenadier death animation in Sarin Gas 3 mission.	2021-01-11 11:32:49 +01:00
Paul Chote	ff1bfe162b	Add death types support to the Lua Kill() API.	2021-01-11 11:32:47 +01:00
Paul Chote	c642162d55	Cancel support power targeting if power cannot be activated.	2021-01-10 22:43:41 +01:00
Paul Chote	4bec1d1950	Add a per-player handicap option to the lobby. Handicaps reduce unit health, firepower, and build speed.	2021-01-10 22:23:08 +01:00
Paul Chote	e769f51169	Increase lobby and server list width.	2021-01-10 22:22:56 +01:00
Paul Chote	ee19990749	Switch make.ps1 to downloading from our GeoIP data mirror.	2021-01-10 21:13:18 +01:00
Matthias Mailänder	0eefb0bc8c	Fix syntax errors.	2021-01-10 21:10:21 +01:00
Matthias Mailänder	dd10b52955	Use the GitHub action variable for clickable links.	2021-01-10 21:10:19 +01:00
Matthias Mailänder	9a8b5da727	Update SDL 2 nuget package to match the platform.	2021-01-10 21:04:21 +01:00
Smittytron	53fe004c01	Add Aftermath mission Shock Therapy	2021-01-10 02:35:30 +01:00
Paul Chote	eea0ca1a4e	Avoid BuildUnit crash if the item is invalidated before the task runs.	2021-01-10 01:34:26 +01:00
Paul Chote	ccbc78ea98	Add a setting to pause the shellmap.	2021-01-10 00:24:39 +01:00
Paul Chote	befcbe3677	Group bot AttackMove orders.	2021-01-09 23:56:18 +01:00
Orb	1f48359899	Playtest-Balance-Tweaks Commit	2021-01-09 23:23:21 +01:00
Matthias Mailänder	c4aed8af3f	Fix error NU1101: Unable to find package.	2021-01-03 14:09:57 +01:00
Paul Chote	2d30913f06	Disable AttackPopupTurreted state changes when paused.	2021-01-03 12:47:03 +01:00
nvrnight	e3c96cf283	Issue #18936 : The game no longer crashes when TextFieldWidget sends Enter key press and onSelect action is null.	2021-01-03 12:28:24 +01:00
Smittytron	325f414d45	Fix palettes in Fall of Greece 1	2021-01-02 22:46:19 +01:00
Smittytron	4371fb058b	Add campaign-palettes to missions lacking it	2021-01-02 22:46:11 +01:00
Paul Chote	1d3461f5da	Fix exit priority ordering.	2021-01-02 15:42:38 +01:00
Paul Chote	271f2ce539	Start rally point lines at the spawn position instead of the exit cell.	2021-01-02 15:29:37 +01:00
Paul Chote	8c29a44795	Prevent Health: 100 from being added to actors.	2021-01-02 15:11:56 +01:00
Paul Chote	226b96f9b0	Add a friendly type name for Nullable<T>.	2021-01-02 11:39:34 +01:00
abcdefg30	fa75891f62	Explicitly return on failure in make.ps1	2020-12-30 17:33:29 +01:00
Ivaylo Draganov	9c4dd4a08a	Update launch.json to work with the new launcher	2020-12-30 17:32:23 +01:00
Nah	a75de2dd8b	Update defaults.yaml Fix the Building's SoundOnDamageTransition DamagedSounds with the correct one and add a second sound file to DestroyedSounds for more variation like in the original Tiberian Dawn.	2020-12-30 14:07:16 +00:00
abcdefg30	5249841ab7	Move myes1 and mrise1 from Select to Move Mechanic Voices	2020-12-30 02:01:21 +00:00
abcdefg30	01204eb414	Enable mechanic voices from Aftermath	2020-12-30 02:01:17 +00:00
Smittytron	58e86d1499	Remove out of bounds actors from Exodus	2020-12-30 01:51:55 +00:00
Smittytron	3b3c6a6647	Fix lag issue on Exodus by narrowing exit area	2020-12-30 01:51:48 +00:00
abcdefg30	31c6e3826e	Correct Shock Trooper Move and Select voices	2020-12-29 21:15:42 +01:00
Orb	14f5c9d228	Fix-MT-Sound-Commit	2020-12-28 10:57:25 +01:00
Paul Chote	97d165ed94	Fix an incorrect comment in install_assemblies_mono	2020-12-24 12:11:20 +01:00
abcdefg30	d6c9bedd5a	Add the 9th Dark Tournament map as "Oil Spill"	2020-12-21 21:14:17 +01:00
Paul Chote	00bc08e9a8	Fix api output directory.	2020-12-14 18:36:23 +01:00
Paul Chote	924cf4a885	Fix docs.openra.net repository reference.	2020-12-14 18:36:15 +01:00
Paul Chote	1f7eef8ffc	Fix docs.openra.net documentation workflow.	2020-12-13 16:24:41 +00:00