From 86cd158d83142fe7503693567875b1ed96277912 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 9 Feb 2020 20:44:52 +0200
Subject: [PATCH] 3.5.12

---
 build.gradle                         |  4 ++--
 changelog.md                         | 16 ++++++++++++++++
 core/src/com/unciv/logic/GameInfo.kt |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ca7b36b0e..b6eaa76d1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ allprojects {
     version = '1.0.1'
     ext {
         appName = "Unciv"
-        appCodeNumber = 375
-        appVersion = "3.5.11"
+        appCodeNumber = 376
+        appVersion = "3.5.12"
 
         gdxVersion = '1.9.10'
         roboVMVersion = '2.3.1'
diff --git a/changelog.md b/changelog.md
index 2c51561849..6626faaa95 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,19 @@
+## 3.5.12
+
+Mongolian civ added! - by reversi
+
+By Jack Rainy:
+- Improvements to the Diplomacy overview: better spread and can select specific civs
+- Research screen centered on current tech
+
+Resolved #1859 - skip defeated players' turns in multiplayer
+
+Fixed bug where air units in transports couldn't upgrade
+
+Tied the unit upkeep scaling to game speed - by lyrjie
+
+Translation updates
+
 ## 3.5.11
 
 Rectangular maps and better map generation - by reversi
diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt
index f4037f95ca..045def2d97 100644
--- a/core/src/com/unciv/logic/GameInfo.kt
+++ b/core/src/com/unciv/logic/GameInfo.kt
@@ -84,7 +84,7 @@ class GameInfo {
             || UncivGame.Current.simulateUntilTurnForDebug > turns
                 // For multiplayer, if there are 3+ players and one is defeated,
                 // we'll want to skip over their turn
-                || thisPlayer.isDefeated()
+                || (thisPlayer.isDefeated() && gameParameters.isOnlineMultiplayer)
         ) {
             if (!thisPlayer.isDefeated() || thisPlayer.isBarbarian()) {
                 NextTurnAutomation().automateCivMoves(thisPlayer)