From 72bf5f198d4a0d74ea3383f14a63f8b4d5079a82 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 28 Apr 2021 22:38:49 +0300
Subject: [PATCH] 3.14.4

---
 .../jsons/translations/German.properties      |  8 ------
 buildSrc/src/main/kotlin/BuildConfig.kt       |  4 +--
 changelog.md                                  | 27 +++++++++++++++----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties
index c05e524c5c..e2673ffe06 100644
--- a/android/assets/jsons/translations/German.properties
+++ b/android/assets/jsons/translations/German.properties
@@ -267,9 +267,7 @@ Mods: = Modifikationen
 Base ruleset mods: = Basisregelsatz Modifikationen
 Extension mods: = Erweiterungs Modifikationen
 
- # Requires translation!
 World Wrap = World Wrap
- # Requires translation!
 World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes! = World Wrap Karten verbrauchen sehr viel Speicher - Das erstellen von großen World Wrap Karten kann bei Android zu einem Absturz führen!
 
 # Multiplayer
@@ -514,7 +512,6 @@ Culture = Kultur
 Food = Nahrung
 
 Crop Yield = Ernteertrag
- # Requires translation!
 Territory = Territorium
 Force = Kampfkraft
 GOLDEN AGE = GOLDENES ZEITALTER
@@ -2987,7 +2984,6 @@ Ocean = Ozean
 Coast = Küste
 
 Occurs at temperature between [param] and [param2] and humidity between [param3] and [amount] = Tritt auf bei temperaturen zwischen [param] und [param2] und einer Feuchtigkeit zwischen [param3] und [amount]
- # Requires translation!
 Open terrain = Offenes Gelände
 Grassland = Wiese
 
@@ -2999,7 +2995,6 @@ Desert = Wüste
 
 Lakes = Seen
 
- # Requires translation!
 Rough terrain = Unwegsames Gelände
 Hill = Hügel
 
@@ -3103,7 +3098,6 @@ Manufactory = Fabrik
 Customs house = Zollamt
 
 Deal 30 damage to adjacent enemy units = Fügt angrgenzenden gegnerischen Einheiten 30 Schadenspunkte pro Runde zu
- # Requires translation!
 Can be built just outside your borders = Kann nur außerhalb Deiner eigenen Grenzen gebaut werden
 Citadel = Zitadelle
 
@@ -3190,7 +3184,6 @@ Heal Instantly = Sofortige Heilung
 Heal this Unit by 50 HP; Doing so will consume this opportunity to choose a Promotion = Heile diese Einheit um 50 LP; dadurch kann keine Beförderung mehr gewählt werden.
 
 Accuracy I = Genauigkeit I
- # Requires translation!
 +[amount]% Strength in [param] = +[amount]% Stärke in [param]
 
 Accuracy II = Genauigkeit II
@@ -3204,7 +3197,6 @@ Barrage II = Sperrfeuer II
 Barrage III = Sperrfeuer III
 
 Volley = Salve
- # Requires translation!
 +[amount]% Strength vs [unitType] = +[amount]% Stärke gegen [unitType]
 
 Extended Range = erweiterte Reichweite
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index 9f5d63ffcb..d56e9e2509 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.4.30"
     const val appName = "Unciv"
-    const val appCodeNumber = 559
-    const val appVersion = "3.14.3-patch1"
+    const val appCodeNumber = 560
+    const val appVersion = "3.14.4"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 90e49e215d..4910ceabdd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,12 +1,29 @@
+## 3.14.4
+
+Resolved #3524 - Happiness in city overview now calculated correctly
+
+Added Happiness (and Faith for Religion mods) to stats list - #3524
+
+Resolved #3837 - Harad -> Harald in Denmark greeting
+
+By SomeTroglodyte:
+
+- Keyboard navigation to switch panes within overview screen
+- Some visual improvements for the Mod Manager Screen
+- Bigger target on "next city" button
+- Fixed #3729 "Android crash on loading from custom location"
+
+By GGGuenni:
+- Added fogOfWarColor and unexploredTileColor
+- Fixed internal TileSetConfigs not getting loaded on android
+
 ## 3.14.3
 
-Added "Updated!" next to updated mods in mod management screen
+Added 'update time', 'open Github page', and marked updated mods, in mod management screen
 
-Added 'last updated time' and 'open Github page of mod' in mod management screen
+Cannot enter diplomacy screen for irrelevant civs through diplomacy overview
 
-Cannot enter diplomacy screen for self, defeated and spectator civs through diplomacy overview
-
-Resolved #3817 - don't display resource requirements from uniques twice
+Resolved #3817 - don't display resource requirements twice
 
 By SomeTroglodyte: