Anuken 393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ... Conflicts: core/assets/icons/icons.properties core/src/mindustry/content/Blocks.java core/src/mindustry/world/meta/StatValues.java		2021-09-04 23:12:28 -04:00
..
bundle_be.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_bg.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_cs.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_da.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_de.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_es.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_et.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_eu.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_fi.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_fil.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
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	Stone craters name fix	2021-08-09 12:13:07 -04:00
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	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_nl_BE.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_nl.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_pl.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_pt_BR.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_pt_PT.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
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	Stone craters name fix	2021-08-09 12:13:07 -04:00
bundle_th.properties	Avoid ambiguity (#5809)	2021-08-23 12:37:34 -04:00
bundle_tk.properties	Stone craters name fix	2021-08-09 12:13:07 -04:00
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-09-04 23:12:28 -04:00