Mindustry/core/assets/bundles
Patrick 'Quezler' Mounier a1d4804fae
Merge branch '6.0' into crater
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
2020-04-16 17:13:18 +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 I18n es tiny fix (#1865) 2020-04-14 10:04:13 -04:00
bundle_et.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_eu.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_fi.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_fr_BE.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
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 Updated translation for bundle_in_ID.properties (#1824) 2020-04-09 09:37:34 -04:00
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 Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_lt.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
bundle_nl_BE.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
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 Update bundle_pt_BR.properties (#1839) 2020-04-12 17:43:51 -04:00
bundle_pt_PT.properties Updated bundles with missing text 2020-03-27 16:13:41 -04:00
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 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-16 10:14:13 -04:00
bundle_zh_CN.properties Update bundle_zh_CN.properties (#1815) 2020-04-04 09:16:25 -04:00
bundle_zh_TW.properties Update bundle_zh_TW.properties (#1876) 2020-04-16 09:14:36 -04:00
bundle.properties Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-16 10:14:13 -04:00