Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c0d250560a651a463dee57ec1826af8761d9fc78
Mindustry/core/assets/bundles
History
Patrick 'Quezler' Mounier 05ccdfd51b 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-02-05 10:26:34 +01:00
..
bundle_cs.properties
Czech translation - update (#1432)
2020-01-25 17:51:32 -05:00
bundle_de.properties
Update bundle_de.properties (#1423)
2020-01-23 18:57:24 -05:00
bundle_es.properties
Update bundle_es.properties (NEW!) (#1352)
2020-01-10 22:16:06 -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
Update finnish language properties (#1396)
2020-01-24 10:09:48 -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
Translated stat.playtime (#1485)
2020-02-03 12:54:06 -05:00
bundle_ja.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_ko.properties
Update bundle_ko.properties (#1379)
2020-01-23 18:08:47 -05:00
bundle_nl_BE.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_nl.properties
Update bundle_nl.properties (#1499)
2020-02-03 12:37:28 -05:00
bundle_pl.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_pt_BR.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_pt_PT.properties
Update bundle_pt_PT.properties (#1351)
2020-01-23 18:09:25 -05:00
bundle_ru.properties
PRE 103 RU_updates (#1425)
2020-01-24 11:31:14 -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
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_uk_UA.properties
Update bundle_uk_UA.properties (#1434)
2020-01-25 17:51:17 -05:00
bundle_zh_CN.properties
Update zh_CN translate (#1412)
2020-01-23 18:09:40 -05:00
bundle_zh_TW.properties
Update bundle_zh_TW.properties (#1438)
2020-01-25 17:51:24 -05:00
bundle.properties
Merge branch 'master' into crater
2020-02-05 10:26:34 +01:00