From 62e78dec1ccef07fca5c8b88a407c4e2bd4cd85f Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 30 Mar 2020 22:54:40 +0300
Subject: [PATCH] 3.6.14

---
 build.gradle                                  |  4 ++--
 changelog.md                                  | 19 +++++++++++++++++++
 .../src/com/unciv/testing/TranslationTests.kt |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 673b2d9ea3..403b0560bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ allprojects {
     version = '1.0.1'
     ext {
         appName = "Unciv"
-        appCodeNumber = 401
-        appVersion = "3.6.13"
+        appCodeNumber = 402
+        appVersion = "3.6.14"
 
         gdxVersion = '1.9.10'
         roboVMVersion = '2.3.1'
diff --git a/changelog.md b/changelog.md
index ea7c332836..6b24522d5b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,22 @@
+## 3.6.14
+
+Harbors immediately connect cities
+
+Revealed resources near cities generate notifications
+
+Cities in unit overview are translated
+
+Resolved #1885 - Both sides of per-turn trades end at the same time, resources offered in trade requests are not considered 
+yours for that turn
+
+Resoved #1869 - added WASD support for map panning
+
+Resolved #1779 - Can lock worked tiles to prevent them from being unassigned
+
+Resources in Civilopedia state consuming units and buildings - #1964
+
+Translation updates
+
 ## 3.6.13
 
 By rh-github-2015:
diff --git a/tests/src/com/unciv/testing/TranslationTests.kt b/tests/src/com/unciv/testing/TranslationTests.kt
index ff36dd631d..12cd57f103 100644
--- a/tests/src/com/unciv/testing/TranslationTests.kt
+++ b/tests/src/com/unciv/testing/TranslationTests.kt
@@ -162,7 +162,7 @@ class TranslationTests {
         for (key in translations.keys) {
             val placeholders = placeholderPattern.findAll(key).map { it.value }.toList()
             for (language in languages) {
-                placeholders.forEach { placeholder ->
+                for (placeholder in placeholders) {
                     if (!translations.get(key, language).contains(placeholder)) {
                         allTranslationsHaveCorrectPlaceholders = false
                         println("Placeholder `$placeholder` not found in `$language` for key `$key`")