Anuken d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/src/mindustry/content/Planets.java tools/src/mindustry/tools/Generators.java		2021-10-20 10:45:51 -04:00
..
bundle_be.properties
bundle_bg.properties
bundle_cs.properties
bundle_da.properties
bundle_de.properties	Update bundle_de.properties (#6150)	2021-10-14 11:38:25 -04:00
bundle_es.properties	[ES] Updated spanish translation (#6031)	2021-10-12 14:16:22 -04:00
bundle_et.properties
bundle_eu.properties
bundle_fi.properties
bundle_fil.properties	Update bundle_fil.properties (#6128)	2021-10-09 17:15:43 -04:00
bundle_fr.properties	Update bundle_fr.properties (#6172)	2021-10-17 15:23:59 -04:00
bundle_hu.properties
bundle_in_ID.properties
bundle_it.properties
bundle_ja.properties	Update bundle_ja.properties (#6121)	2021-10-08 18:11:19 -04:00
bundle_ko.properties	Update [KO] bundles once again (#6147)	2021-10-16 09:49:58 -04:00
bundle_lt.properties
bundle_nl_BE.properties
bundle_nl.properties
bundle_pl.properties	Update bundle_pl.properties (#5206)	2021-10-09 14:08:44 -04:00
bundle_pt_BR.properties
bundle_pt_PT.properties
bundle_ro.properties
bundle_ru.properties	Lol (#6171)	2021-10-16 12:45:16 -04:00
bundle_sr.properties	Serbian translation of all blocks (#6129)	2021-10-12 15:36:29 -04:00
bundle_sv.properties
bundle_th.properties	Update bundle_th.properties (#6162)	2021-10-16 09:46:27 -04:00
bundle_tk.properties
bundle_tr.properties	TR Translation, fix for 132 (#6176)	2021-10-17 15:24:10 -04:00
bundle_uk_UA.properties	Update bundle_uk_UA.properties (#6180)	2021-10-17 15:23:50 -04:00
bundle_vi.properties
bundle_zh_CN.properties	Revert "Update this bundle (#6081)" (#6143)	2021-10-12 15:18:56 -04:00
bundle_zh_TW.properties
bundle.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-10-20 10:45:51 -04:00