Anuken 26dd7e00eb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/src/mindustry/content/UnitTypes.java		2021-08-25 09:22:23 -04:00
..
bundle_be.properties
bundle_bg.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_cs.properties
bundle_da.properties
bundle_de.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_es.properties
bundle_et.properties
bundle_eu.properties
bundle_fi.properties
bundle_fil.properties
bundle_fr.properties	Updates bundle_fr.properties (#5663)	2021-08-23 16:58:31 -04:00
bundle_hu.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_in_ID.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_it.properties
bundle_ja.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_ko.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_lt.properties
bundle_nl_BE.properties
bundle_nl.properties
bundle_pl.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_pt_BR.properties
bundle_pt_PT.properties
bundle_ro.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_ru.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_sv.properties
bundle_th.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_tk.properties
bundle_tr.properties	TR Fix (#5781)	2021-08-23 14:41:32 -04:00
bundle_uk_UA.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_vi.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_zh_CN.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_zh_TW.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle.properties	Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features	2021-08-25 09:22:23 -04:00