Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e5e488444808e3daf273f61c718d817c911182db
Mindustry/core/assets/bundles
History
Patrick 'Quezler' Mounier e5e4884448 Merge branch 'master' into crater 
# Conflicts:
#	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/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
..
bundle_cs.properties
Czech translation - sync with v104 (#1612)
2020-02-21 16:27:05 -05:00
bundle_de.properties
translated; spelling errors, odd phrases removed
2020-02-12 01:46:13 +01:00
bundle_es.properties
Update Silicon translation in spanish (#1639)
2020-02-26 11:01:56 -05:00
bundle_et.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_eu.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_fi.properties
Finnish translation & grammar update (#1473)
2020-02-07 20:42:14 -05:00
bundle_fr_BE.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_fr.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_in_ID.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_it.properties
Updated join.info (#1666)
2020-03-04 13:53:47 -05:00
bundle_ja.properties
Update bundle_ja.properties (#1578)
2020-03-01 21:09:08 -05:00
bundle_ko.properties
Update bundle_ko.properties (#1629)
2020-03-01 21:03:41 -05:00
bundle_lt.properties
Updated data.import.confirm lane (#1658)
2020-03-03 10:36:34 -05:00
bundle_nl_BE.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_nl.properties
[Lang] Changed some nl Translations (#1626)
2020-03-01 21:03:00 -05:00
bundle_pl.properties
Update bundle_pl.properties (#1643)
2020-03-01 21:04:07 -05:00
bundle_pt_BR.properties
Update bundle_pt_BR.properties (#1525)
2020-02-11 15:25:38 -05:00
bundle_pt_PT.properties
Merge pull request #1597 from GioIacca9/patch-3
2020-02-18 11:51:37 -05:00
bundle_ru.properties
RU updates (#1584)
2020-03-01 21:06:16 -05:00
bundle_sv.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_th.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_tk.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_tr.properties
Translation to Turkish
2020-02-15 15:15:27 +02:00
bundle_uk_UA.properties
Update bundle_uk_UA.properties (#1636)
2020-03-04 13:52:20 -05:00
bundle_zh_CN.properties
Update bundle_zh_CN.properties
2020-02-13 14:56:46 +08:00
bundle_zh_TW.properties
Update bundle_zh_TW.properties (#1665)
2020-03-04 13:53:54 -05:00
bundle.properties
Merge branch 'master' into crater
2020-03-05 10:00:02 +01:00