Mindustry/core/assets/bundles
Patrick 'Quezler' Mounier 39266d23c8
Merge branch 'master' into crater
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
2020-04-23 21:10:48 +02:00
..
bundle_be.properties Create bundle_be.properties (#1797) 2020-04-01 01:19:44 -04:00
bundle_cs.properties Czech translation - up to date (#1836) 2020-04-10 18:45:01 -04:00
bundle_de.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_es.properties Update bundle_es.properties (#1899) 2020-04-22 16:20:07 -04:00
bundle_et.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_eu.properties
bundle_fi.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_fr_BE.properties
bundle_fr.properties Revised french translation, corrected syntax errors (grammar, spelling), coherence with names. (#1822) 2020-04-05 13:56:17 -04:00
bundle_in_ID.properties
bundle_it.properties Minor changes (#1858) 2020-04-13 21:22:49 -04:00
bundle_ja.properties update (#1862) 2020-04-13 21:21:10 -04:00
bundle_ko.properties Fixed inconsistencies with the word 'schematic' (#1892) 2020-04-21 11:03:09 -04:00
bundle_lt.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_nl_BE.properties
bundle_nl.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_pl.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_pt_BR.properties
bundle_pt_PT.properties
bundle_ru.properties RU updates (#1866) 2020-04-14 10:04:29 -04:00
bundle_sv.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_th.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_tk.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_tr.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_uk_UA.properties
bundle_zh_CN.properties
bundle_zh_TW.properties
bundle.properties Merge branch '6.0' into crater 2020-04-16 22:38:51 +02:00