Yair Morgenstern 95b3397c48 Merge branch 'master' of https://github.com/yairm210/Unciv ... # Conflicts: # core/src/com/unciv/logic/civilization/TechManager.kt		2019-12-17 14:24:17 +02:00
..
ExtraImages	Resolved #1422 - resources are now spread over different terrains as much as possible	2019-12-08 21:19:45 +02:00
jsons	Merge branch 'master' of https://github.com/yairm210/Unciv	2019-12-17 14:24:17 +02:00
mods/myFirstMod/jsons	Resolved #1420 - Menu in the map editor no longer opens multiple times on subsequent clicks	2019-12-06 10:12:16 +02:00
music
skin
sounds
game2.png	Natural Wonders (#1456)	2019-12-16 20:37:49 +02:00
game.atlas	Not all Natural Wonders look good enough to enter the game as-of-now.	2019-12-17 14:23:17 +02:00
game.png	Not all Natural Wonders look good enough to enter the game as-of-now.	2019-12-17 14:23:17 +02:00
GameSettingsOld.json	Cleaned up tutorials	2019-12-12 20:58:02 +02:00