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

..

Nations

Natural Wonders (#1456)

2019-12-16 20:37:49 +02:00

translationsByLanguage

Update Italian.properties (#1470)

2019-12-17 14:00:52 +02:00

Tutorials

1. some translation update. 2. modify limitOverflowScience Decision condition. (#1469)

2019-12-17 12:59:39 +02:00

Buildings.json

Nuke your enemy! (#1318)

2019-11-19 08:43:04 +02:00

Difficulties.json

…

GreatPeopleNames.json

…

Policies.json

correct spelling of "Fascism" policy (#1432)

2019-12-08 18:40:48 +02:00

Techs.json

Fixed quote typo

2019-12-14 23:37:29 +02:00

Terrains.json

Not all Natural Wonders look good enough to enter the game as-of-now.

2019-12-17 14:23:17 +02:00

TileImprovements.json

More map editor normalization, because people will doo whatever they can to break the system

2019-12-06 10:23:30 +02:00

TileResources.json

…

UnitPromotions.json

Natural Wonders (#1456)

2019-12-16 20:37:49 +02:00

Units.json

Changed Great Scientist unique and action strings in all languages, and removed BasicHelp - all the important info should be in the tutorials anyway.

2019-12-15 21:21:17 +02:00