Anuken afe963ca5d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/src/mindustry/editor/MapInfoDialog.java core/src/mindustry/maps/filters/ClearFilter.java core/src/mindustry/mod/ClassMap.java gradle.properties		2021-06-17 10:44:51 -04:00
..
bundle_be.properties
bundle_bg.properties
bundle_cs.properties
bundle_da.properties
bundle_de.properties
bundle_es.properties
bundle_et.properties
bundle_eu.properties
bundle_fi.properties
bundle_fil.properties
bundle_fr.properties
bundle_hu.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_ro.properties
bundle_ru.properties
bundle_sv.properties
bundle_th.properties
bundle_tk.properties
bundle_tr.properties
bundle_uk_UA.properties
bundle_vi.properties
bundle_zh_CN.properties
bundle_zh_TW.properties
bundle.properties