Anuken 95a0f4e735 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/assets/bundles/bundle_fil.properties		2022-02-14 23:34:54 -05:00
..
bundle_be.properties
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	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
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	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
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	Automatic bundle update	2022-02-12 14:27:18 +00:00
bundle_fr.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2022-01-27 14:58:44 -05:00
bundle_hu.properties
bundle_in_ID.properties
bundle_it.properties
bundle_ja.properties
bundle_ko.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_lt.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
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 13:17:36 -05:00
bundle_sr.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-11-22 12:11:31 -05:00
bundle_sv.properties
bundle_th.properties
bundle_tk.properties
bundle_tr.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2022-02-14 23:34:54 -05:00
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	Placement range check rule implemented	2022-02-13 21:02:33 -05:00