From ae805284a6925b27d22e649ab24e08e76bbb04dd Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 2 Jan 2021 22:09:08 +0200
Subject: [PATCH] 3.12.6

---
 buildSrc/src/main/kotlin/BuildConfig.kt       |  4 ++--
 changelog.md                                  | 23 +++++++++++++++++++
 core/src/com/unciv/logic/city/CityStats.kt    | 11 ---------
 .../unciv/ui/cityscreen/ConstructionsTable.kt |  8 ++++---
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index fbc8c51f94..2ba3df3dab 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.3.71"
     const val appName = "Unciv"
-    const val appCodeNumber = 516
-    const val appVersion = "3.12.5"
+    const val appCodeNumber = 517
+    const val appVersion = "3.12.6"
 
     const val gdxVersion = "1.9.12"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 38eb101a57..aa175ce278 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,26 @@
+## 3.12.6
+
+Resolved #3483 - settlers require at least 2 population to construct, as per Civ V
+
+Set a max cap on unit maintenance - does not increase past the base turn limit
+
+Resolved #3472 - can purchase 'free' tiles in cities even with negative gold
+
+Resolved #3490 - fixed formatting problem in trade popup
+
+Resolved #3489 - City state influence is affected by war/peace with their enemies
+
+Resolved #3475 - capturing settlers moves us to the captured units' tile
+
+Better visual aircraft indicators
+
+Solved ANRs when loading big maps in editor screen
+
+By 9kgsofrice:
+
+- Modded buildings never lead cities to negative production
+- "happiness from garrison" effect was duplicated 
+
 ## 3.12.5
 
 Resolved #3470 - popups now make the rest of the screen unclickable to avoid exploits
diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt
index e74ef70adc..4ccdf0d1a3 100644
--- a/core/src/com/unciv/logic/city/CityStats.kt
+++ b/core/src/com/unciv/logic/city/CityStats.kt
@@ -248,17 +248,6 @@ class CityStats {
         return !cityInfo.containsBuildingUnique("Remove extra unhappiness from annexed cities")
     }
 
-    fun getStatsOfSpecialist(stat: Stat): Stats {
-        val stats = Stats()
-        if (stat == Stat.Culture || stat == Stat.Science) stats.add(stat, 3f)
-        else stats.add(stat, 2f) // science and gold specialists
-
-        for (unique in cityInfo.civInfo.getMatchingUniques("[] from every specialist"))
-            stats.add(unique.stats)
-
-        return stats
-    }
-
     fun getStatsOfSpecialist(specialistName: String): Stats {
         val specialist = cityInfo.getRuleset().specialists[specialistName]
         if (specialist == null) return Stats()
diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
index e9d2cf2fbd..d76c56c8bd 100644
--- a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
@@ -155,9 +155,11 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
                     buttonText,
                     building.getRejectionReason(cityConstructions)
             )
-            if (building.isWonder) buildableWonders += productionTextButton
-            else if (building.isNationalWonder) buildableNationalWonders += productionTextButton
-            else buildableBuildings += productionTextButton
+            when {
+                building.isWonder -> buildableWonders += productionTextButton
+                building.isNationalWonder -> buildableNationalWonders += productionTextButton
+                else -> buildableBuildings += productionTextButton
+            }
         }
 
         for (specialConstruction in PerpetualConstruction.perpetualConstructionsMap.values