Anuken b0503d9930 Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry ... # Conflicts: # core/src/io/anuke/mindustry/entities/type/FlyingUnit.java # gradle.properties		2019-09-29 17:03:28 -04:00
..
bundle_cs.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_de.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_es.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_et.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_eu.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_fr_BE.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_fr.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_in_ID.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_it.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_ja.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_ko.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_nl_BE.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_nl.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_pl.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_pt_BR.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_ru.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_se.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_tk.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_tr.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_uk_UA.properties	Ukrainian language (#715)	2019-09-29 12:53:52 -04:00
bundle_zh_CN.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle_zh_TW.properties	Bugfixes / Bundles updated	2019-09-26 15:41:42 -04:00
bundle.properties	Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry	2019-09-29 17:03:28 -04:00