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
..
assets	Merge branch 'master' of https://github.com/yairm210/Unciv	2019-12-17 14:24:17 +02:00
Images	Not all Natural Wonders look good enough to enter the game as-of-now.	2019-12-17 14:23:17 +02:00
ImagesToNotAddToGame	Organized non-game images (icon, feature and promo graphics etc)	2019-02-14 21:44:25 +02:00
res	Android icons up-to-date	2019-12-08 18:53:41 +02:00
src	all codes are writen in Kotlin (#1452)	2019-12-15 20:28:34 +02:00
AndroidManifest.xml	Should now be recognized as Game in Android	2019-11-27 20:44:15 +02:00
build.gradle	All languages should work for everyone	2019-12-15 22:00:12 +02:00
ic_launcher-web.png	Initial commit	2017-11-22 00:09:35 +02:00
proguard-rules.pro	all codes are writen in Kotlin (#1452)	2019-12-15 20:28:34 +02:00
project.properties	Initial commit	2017-11-22 00:09:35 +02:00