Mindustry

Files

Anuken 302ae0a83c Merge remote-tracking branch 'origin/4.0' into 4.0

# Conflicts:
#	core/assets/bundles/bundle_ko.properties

2018-07-13 13:48:52 -04:00

bundle_de.properties

2018-07-13 13:43:37 -04:00

bundle_es.properties

2018-07-13 13:43:37 -04:00

bundle_fr.properties

2018-07-13 13:43:37 -04:00

bundle_in_ID.properties

2018-07-13 13:43:37 -04:00

bundle_ita.properties

2018-07-13 13:43:37 -04:00

bundle_ko.properties

2018-07-13 13:48:52 -04:00

bundle_pl.properties

2018-07-13 13:43:37 -04:00

bundle_pt_BR.properties

2018-07-13 13:43:37 -04:00

bundle_ru.properties

2018-07-13 13:43:37 -04:00

bundle_tk.properties

2018-07-13 13:43:37 -04:00

bundle_uk_UA.properties

2018-07-13 13:43:37 -04:00

bundle.properties

2018-07-13 13:43:37 -04:00