From 4cb5a8c912dc134325aee9ee59a8742cb85ee72a Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 6 May 2021 11:47:41 +0300
Subject: [PATCH] 3.14.6-patch2

---
 android/assets/jsons/TileSets/FantasyHex.json | 6 ++++++
 buildSrc/src/main/kotlin/BuildConfig.kt       | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/android/assets/jsons/TileSets/FantasyHex.json b/android/assets/jsons/TileSets/FantasyHex.json
index d0c8e93346..88b408e487 100644
--- a/android/assets/jsons/TileSets/FantasyHex.json
+++ b/android/assets/jsons/TileSets/FantasyHex.json
@@ -16,6 +16,12 @@
         "Hill+Forest+Furs": ["Grassland","Hill","Furs","HillForest"],
         "Hill+Forest+Deer": ["Grassland","Hill","Deer","HillForest"],
 		
+		"Grassland+Hill+Forest": ["Grassland","Hill","HillForest"],
+		"Plains+Hill+Forest": ["Plains","Hill","HillForest"],
+		"Tundra+Hill+Forest": ["Tundra","Hill","HillForest"],
+		"Desert+Hill+Forest": ["Desert","Hill","HillForest"],
+		"Snow+Hill+Forest": ["Snow","Hill","HillForest"],
+		
         "Hill+Furs+Ancient ruins": ["Grassland","Hill","Ancient ruins","Sheep"],
         "Grassland+Jungle+Ancient ruins": ["Grassland","Ancient ruins", "GrasslandJungle"],
         "Grassland+Forest+Ancient ruins": ["Grassland","Ancient ruins", "GrasslandForest"],
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index bc3b7413ac..533ee28fb9 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 = 563
-    const val appVersion = "3.14.6-patch1"
+    const val appCodeNumber = 564
+    const val appVersion = "3.14.6-patch2"
 
     const val gdxVersion = "1.10.0"
     const val roboVMVersion = "2.3.1"