Anuken 268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry ... # Conflicts: # core/src/io/anuke/mindustry/content/Blocks.java # gradle.properties		2019-12-08 00:15:42 -05:00
..
bundle_cs.properties
bundle_de.properties
bundle_es.properties
bundle_et.properties
bundle_eu.properties	Update bundle_eu.properties (#1114)	2019-11-22 20:59:42 -05:00
bundle_fi.properties	Starting bundle_fi.properties (#900)	2019-11-28 22:04:58 -05:00
bundle_fr_BE.properties
bundle_fr.properties	Add storable indication in core database (#1124)	2019-11-24 01:35:16 -05:00
bundle_in_ID.properties
bundle_it.properties
bundle_ja.properties	Update bundle_ja.properties (#1108)	2019-11-21 15:49:26 -05:00
bundle_ko.properties
bundle_nl_BE.properties
bundle_nl.properties
bundle_pl.properties	Update bundle_pl.properties (#1119)	2019-11-23 15:16:32 -05:00
bundle_pt_BR.properties	Update bundle_pt_BR.properties (#1128)	2019-12-01 00:08:40 -05:00
bundle_pt.properties
bundle_ru.properties	RU updates (#1172)	2019-12-07 17:39:35 -05:00
bundle_sv.properties
bundle_tk.properties
bundle_tr.properties
bundle_uk_UA.properties	Ukrainian translation (#1144)	2019-12-01 00:04:35 -05:00
bundle_zh_CN.properties	Update bundle_zh_CN.properties (#1113)	2019-11-22 21:00:11 -05:00
bundle_zh_TW.properties	Update bundle_zh_TW.properties (#1133)	2019-12-01 00:10:51 -05:00
bundle.properties	Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry	2019-12-08 00:15:42 -05:00