Anuken 6de48b4535 Merge branches '4.0' and 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/version.properties # core/src/io/anuke/mindustry/core/NetClient.java # core/src/io/anuke/mindustry/world/Tile.java		2018-03-03 18:06:57 -05:00
..
bundle_de.properties
bundle_es_LA.properties
bundle_fr_FR.properties	More debugging changes	2018-03-02 15:01:49 -05:00
bundle_in_ID.properties
bundle_ko.properties
bundle_pl_PL.properties
bundle_pt_BR.properties
bundle_ru.properties
bundle.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-02-27 19:58:34 -05:00