Anuken d3ec50825e Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/version.properties # core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java		2018-02-27 19:58:34 -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	Basic multiplayer placing/breaking/movement (broken)	2017-12-31 14:23:13 -05:00
bundle_fr_FR.properties	Update bundle_fr_FR.properties	2018-02-03 12:45:58 +01:00
bundle_in_ID.properties	Bugfixes	2018-02-01 09:24:46 -05:00
bundle_ko.properties	Implemented map run-length encoding, updated KO lang	2018-01-26 00:08:12 -05:00
bundle_pl_PL.properties	Added polish lang, fixed conveyor stacking bug	2018-01-31 10:20:52 -05:00
bundle_pt_BR.properties	Basic multiplayer placing/breaking/movement (broken)	2017-12-31 14:23:13 -05:00
bundle_ru.properties	Updated Russian bundle	2018-02-12 16:11:46 -05:00
bundle.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0	2018-02-27 19:58:34 -05:00