Anuken 436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/src/mindustry/world/blocks/BuildBlock.java		2020-03-17 20:03:12 -04:00
..
bundle_cs.properties
bundle_de.properties
bundle_es.properties
bundle_et.properties
bundle_eu.properties
bundle_fi.properties	Update bundle_fi.properties (#1720)	2020-03-17 12:02:47 -04:00
bundle_fr_BE.properties
bundle_fr.properties
bundle_in_ID.properties
bundle_it.properties	Updated join.info (#1666)	2020-03-04 13:53:47 -05:00
bundle_ja.properties
bundle_ko.properties
bundle_lt.properties	Updated data.import.confirm lane (#1658)	2020-03-03 10:36:34 -05:00
bundle_nl_BE.properties
bundle_nl.properties
bundle_pl.properties
bundle_pt_BR.properties
bundle_pt_PT.properties
bundle_ru.properties
bundle_sv.properties
bundle_th.properties
bundle_tk.properties
bundle_tr.properties
bundle_uk_UA.properties	Bugfixes	2020-03-06 16:10:13 -05:00
bundle_zh_CN.properties
bundle_zh_TW.properties	Update bundle_zh_TW.properties (#1718)	2020-03-17 12:02:56 -04:00
bundle.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0	2020-03-17 20:03:12 -04:00