Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
5c28985ee663939c67232c9a8d3fee7fffd9764e
Mindustry/core/assets/bundles
History
Patrick 'Quezler' Mounier 5c28985ee6 Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
2020-04-16 12:39:52 +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 branch '6.0' into crater
2020-04-16 12:39:52 +02: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 (#1792)
2020-03-31 09:32:50 -04:00
bundle.properties
Merge branch '6.0' into crater
2020-04-16 12:39:52 +02:00