Anuken b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 ... # Conflicts: # core/assets/bundles/bundle_uk_UA.properties # core/src/mindustry/core/NetClient.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/blocks/power/ImpactReactor.java # gradle.properties		2020-04-11 10:37:52 -04:00
..
bundle_be.properties
bundle_cs.properties
bundle_de.properties
bundle_es.properties
bundle_et.properties
bundle_eu.properties
bundle_fi.properties
bundle_fr_BE.properties
bundle_fr.properties
bundle_in_ID.properties
bundle_it.properties
bundle_ja.properties
bundle_ko.properties
bundle_lt.properties
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
bundle_zh_CN.properties
bundle_zh_TW.properties
bundle.properties