From 0f1f5bf74630c50d211909835d35191943b82ffe Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Tue, 17 Sep 2019 09:50:57 +0800
Subject: [PATCH 1/3] Spaceship should not be bought.

---
 core/src/com/unciv/models/gamebasics/Building.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/unciv/models/gamebasics/Building.kt b/core/src/com/unciv/models/gamebasics/Building.kt
index b5bc734785..8b0f2b5add 100644
--- a/core/src/com/unciv/models/gamebasics/Building.kt
+++ b/core/src/com/unciv/models/gamebasics/Building.kt
@@ -184,7 +184,7 @@ class Building : NamedStats(), IConstruction{
     }
 
     override fun canBePurchased(): Boolean {
-        return !isWonder && !isNationalWonder
+        return !isWonder && !isNationalWonder && ("Spaceship part" !in uniques)
     }
 
 

From 2ef533f57b8ab51aef96c845e45d0cc4c653eed8 Mon Sep 17 00:00:00 2001
From: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Date: Tue, 17 Sep 2019 07:14:36 +0200
Subject: [PATCH 2/3] Update Credits.md (#1087)

* Update Credits.md

* Update Credits.md
---
 docs/Credits.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/Credits.md b/docs/Credits.md
index 376f198942..3032297576 100644
--- a/docs/Credits.md
+++ b/docs/Credits.md
@@ -30,6 +30,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Spear](https://thenounproject.com/search/?q=Spear&i=11432) By Stephen Copinger for Spearman
 * [Greek shield](https://thenounproject.com/search/?q=hoplite&i=440135) for Hoplite
 * [Spiked club](https://thenounproject.com/search/?q=club%20weapon&creator=1933477&i=831794) for Brute
+* [Hoplite](https://www.flaticon.com/free-icon/hoplite_659126#term=hoplite&page=1&position=20) by Eucalyp for Immortal
 
 ### Classical Era
 
@@ -213,6 +214,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516 for Porcelain Tower
 * [Bank](https://thenounproject.com/term/bank/1882194/) By projecthayat
 * [Harbor](https://thenounproject.com/term/harbor/225583/) By Rflor for Seaport
+* [Mansion](https://www.flaticon.com/free-icon/mansion_509903#term=persian&page=1&position=19) by Freepik for Satrap's Court
 
 ### Industrial Era
 
@@ -439,6 +441,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Ashika Chakra](https://thenounproject.com/search/?q=ashoka%20chakra&i=2328559) by sahua d for India
 * Variation on [crecent moon](https://thenounproject.com/search/?q=crescents&i=1438333) by Estu Suhartono for The Ottomans
 * [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea
+* Two [Sword] Scimitars(https://www.flaticon.com/free-icon/sword_812259#term=scimitar&page=1&position=2) by Those Icons for Persia
 
 ## Promotions
 

From 11840de2ce7dd29869031bb27f4041820d8c7bbc Mon Sep 17 00:00:00 2001
From: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Date: Sun, 15 Sep 2019 23:39:12 +0200
Subject: [PATCH 3/3] Update Nations.json

Two more City-States: Zanzibar and Singapore
---
 android/assets/jsons/Nations/Nations.json | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/android/assets/jsons/Nations/Nations.json b/android/assets/jsons/Nations/Nations.json
index 3a850db279..47d998867e 100644
--- a/android/assets/jsons/Nations/Nations.json
+++ b/android/assets/jsons/Nations/Nations.json
@@ -1239,6 +1239,34 @@
 		innerColor:[0,102,102],
 		cities:["Edinburgh"]
 	},
+	{
+		name:"Singapore",
+		adjective:["Singapore"],
+		cityStateType:"Mercantile",
+
+		declaringWar:"You leave us no choice. War it must be.",
+		attacked:"Very well, this shall not be forgotten.",
+		afterPeace:"May peace forever bless our lands.",
+		defeated:"Perhaps, in another world, we could have been friends..."
+
+		outerColor:[0, 0, 0],
+		innerColor:[255,255,0],
+		cities:["Singapore"]
+	},
+	{
+		name:"Zanzibar",
+		adjective:["Zanzibar"],
+		cityStateType:"Mercantile",
+
+		declaringWar:"You leave us no choice. War it must be.",
+		attacked:"Very well, this shall not be forgotten.",
+		afterPeace:"May peace forever bless our lands.",
+		defeated:"May the Heavens forgive you for inflicting this humiliation to our people."
+
+		outerColor:[0, 0, 0],
+		innerColor:[255,153,255],
+		cities:["Zanzibar"]
+	},