From 94ab46f5409a07a3fd7cee856f44ee88c7962cd0 Mon Sep 17 00:00:00 2001 From: Am-per-Sand <40436282+Am-per-Sand@users.noreply.github.com> Date: Tue, 19 Mar 2019 17:40:55 +0100 Subject: [PATCH 1/6] "Machu Picchu" --- android/assets/jsons/Translations.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index d2cb774163..f7d9c6624b 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -5489,11 +5489,11 @@ German:"Prägerei" } - "Machu Pichu":{ - Italian:"Machu Pichu" + "Machu Picchu":{ + Italian:"Machu Picchu" Russian:"Мачу-Пикчу" - French:"Machu Pichu" - Romanian:"Machu Pichu" + French:"Machu Picchu" + Romanian:"Machu Picchu" Spanish:"Machu Picchu" Simplified_Chinese:"马丘比丘" Portuguese:"Machu Picchu" From 24bd0636b7b88cfe51743a540054e290f650e46f Mon Sep 17 00:00:00 2001 From: Am-per-Sand <40436282+Am-per-Sand@users.noreply.github.com> Date: Tue, 19 Mar 2019 17:41:42 +0100 Subject: [PATCH 2/6] "Machu Picchu" --- Credits.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Credits.md b/Credits.md index d875438a6f..da3565eac5 100644 --- a/Credits.md +++ b/Credits.md @@ -172,7 +172,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Factory](https://thenounproject.com/term/factory/1624235/) By Maxim Kulikov for Ironworks * [Notre Dame](https://thenounproject.com/term/notre-dame/1361725/) By Marco Livolsi * [Bullets](https://thenounproject.com/term/bullets/810156/) By Aldric Rodriguez for Armory -* [Machu Pichu](https://thenounproject.com/term/machu-picchu/1569706/) By Carpe Diem +* [Machu Picchu](https://thenounproject.com/term/machu-picchu/1569706/) By Carpe Diem ### Renaissance Era From 56597f205b47de72805aa589f4d6b4aaa5c1afef Mon Sep 17 00:00:00 2001 From: Am-per-Sand <40436282+Am-per-Sand@users.noreply.github.com> Date: Tue, 19 Mar 2019 17:44:04 +0100 Subject: [PATCH 3/6] "Machu Picchu" --- android/assets/jsons/Buildings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 8c504243e3..6ac29899ef 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -271,7 +271,7 @@ requiredTech:"Civil Service" }, { - name:"Machu Pichu", + name:"Machu Picchu", gold:5, greatPersonPoints:{gold:1}, culture:1, From f83eed0d0824dc24db023f55a954555a76b19f2c Mon Sep 17 00:00:00 2001 From: Am-per-Sand <40436282+Am-per-Sand@users.noreply.github.com> Date: Wed, 20 Mar 2019 18:54:07 +0100 Subject: [PATCH 4/6] new wonder icon Machu Picchu correct --- android/Images/BuildingIcons/Machu Picchu.png | Bin 0 -> 1297 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 android/Images/BuildingIcons/Machu Picchu.png diff --git a/android/Images/BuildingIcons/Machu Picchu.png b/android/Images/BuildingIcons/Machu Picchu.png new file mode 100644 index 0000000000000000000000000000000000000000..81438f767c8f99b1050e8f772912b2ffc9b67ebb GIT binary patch literal 1297 zcmaKsZBSAP6ozpXS3z>uNh{slGHX&{P0Xomx5OYp)HPJPT+5WA5H!n`KGbR>t(3{i zib_jF7qhq+q8CeYOUq6u&(;lO#SYN^^rtBAb%FHdhKfqnImi~_w#NpM5zH0)4` zk0zjM!cV0+>}jX#U=ot`@#LYnw0jW_#ca(ApJUU5l@f(sZDOBIlP5w8`oQWZf0W-} z)DDK;^V~-`#m5Z;2{h)uBFcQ$3wuaCN0)TnoP@U@>B^Q)n^EBkSJgq2%M~y2^wS%0 zYwP063>&Uzujjdns$AjcERQ`G4Cgn)Z9vvC-BX|k4Q)>k8Q|iES%Mluzf=y97hmh!WI$-=#scGZKp$JI-vc_(kxnzTHT z^0}5s0s6JP`^dr2Ge8fX!1b#MNmoR6`OxGXu<|BR$h=YS7#USarUxlLZj!szA5L8s z8KsQZjpK9F1}8A2)7+t6+*v_X+~!{lR}^xNl9<)qFX8IE8&gT9-dX$*ycrFQ0GBGTzTvd`>m z?A;x}$$X$0cV4eD92%Rv!VE~kJ-XRbtO)w>HdZCTuJkY7Drl+vkflT0pWS+-C9EoO zLb5pz>XuB$j|{o`cABs4f6D4u-e~lov6`0n?Lr>nd68uD)Dm!AGVoM^5tK6n+$Zr_6mK^R>YJ2i3tdJC8M2#Wrn$ zY0S%Spu`ecD^tQv-}^?MAY+wY4Av1-=rZs~c>)#$yBI>|d~VZxN*TvNvAXLLnqb3+ zWMhPSmv`W|l^^!8xUXh(x3(JVHZ{9Cy2?$f=K3BoC`AmP!#xz~x&jc^j8B0Pbk8bcIr_&(dd z(b@%7GKbH&>YTn_wI%TmGhK0<-;J1!OieAmkLV@en5fsX;xJDPcEkxw& vM6YI00p$vPrcg{i@L#BWO_%>MBh^!Om+n!Aar@bLTehKSlo)bNc(U+ceN=UB literal 0 HcmV?d00001 From d16322d494f81ace711e9860bc4b4b7999d61e4a Mon Sep 17 00:00:00 2001 From: Am-per-Sand <40436282+Am-per-Sand@users.noreply.github.com> Date: Wed, 20 Mar 2019 18:54:40 +0100 Subject: [PATCH 5/6] Delete Machu Pichu.png --- android/Images/BuildingIcons/Machu Pichu.png | Bin 3871 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 android/Images/BuildingIcons/Machu Pichu.png diff --git a/android/Images/BuildingIcons/Machu Pichu.png b/android/Images/BuildingIcons/Machu Pichu.png deleted file mode 100644 index ce82bc5c8a21aab621845c6585e40b365963cabc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3871 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 Wi>e|OSnJdN$^yTQFswGXhxrd+hk7pn From 926be7c75a8af6ff7a7d47c85342ca89dd5a164c Mon Sep 17 00:00:00 2001 From: Am-per-Sand <40436282+Am-per-Sand@users.noreply.github.com> Date: Wed, 20 Mar 2019 18:59:56 +0100 Subject: [PATCH 6/6] Update Credits.md Machu Picchu correct --- Credits.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Credits.md b/Credits.md index da3565eac5..40fbf21ad6 100644 --- a/Credits.md +++ b/Credits.md @@ -172,7 +172,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Factory](https://thenounproject.com/term/factory/1624235/) By Maxim Kulikov for Ironworks * [Notre Dame](https://thenounproject.com/term/notre-dame/1361725/) By Marco Livolsi * [Bullets](https://thenounproject.com/term/bullets/810156/) By Aldric Rodriguez for Armory -* [Machu Picchu](https://thenounproject.com/term/machu-picchu/1569706/) By Carpe Diem +* [Machu Picchu](https://thenounproject.com/browse/?i=1678226/) By [Chanut is Industries](https://thenounproject.com/chanut-is) ### Renaissance Era