Anuken a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/assets/bundles/bundle_ko.properties core/assets/bundles/bundle_zh_CN.properties core/assets/bundles/bundle_zh_TW.properties		2021-11-22 12:11:31 -05:00
..
bundle_be.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_bg.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_cs.properties
bundle_da.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_de.properties
bundle_es.properties
bundle_et.properties
bundle_eu.properties
bundle_fi.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_fil.properties
bundle_fr.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_hu.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_in_ID.properties
bundle_it.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_ja.properties
bundle_ko.properties
bundle_lt.properties
bundle_nl_BE.properties
bundle_nl.properties
bundle_pl.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_pt_BR.properties
bundle_pt_PT.properties
bundle_ro.properties
bundle_ru.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_sr.properties
bundle_sv.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_th.properties
bundle_tk.properties
bundle_tr.properties
bundle_uk_UA.properties
bundle_vi.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_zh_CN.properties
bundle_zh_TW.properties
bundle.properties