Anuken 9c05ddbd7d Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/version.properties		2018-03-09 20:58:21 -05:00
..
bundle_de.properties	Better net error messages, bugfixes, new command handler	2018-02-23 21:42:05 -05:00
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-03-09 20:58:21 -05:00