Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ed765ad10aa221236a27b544f5afcbbda9af8f2d
Mindustry/core/assets/bundles
History
Patrick 'Quezler' Mounier ed765ad10a 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
2020-01-10 12:02:07 +01:00
..
bundle_cs.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_de.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_es.properties
Merged in liquid void
2020-01-08 11:04:12 -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
Merged in liquid void
2020-01-08 11:04:12 -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 liquid void name and description (#1341)
2020-01-08 16:57:36 -05:00
bundle_ja.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_ko.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_nl_BE.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_nl.properties
Merged in liquid void
2020-01-08 11:04:12 -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
Rename bundle_pt.properties to bundle_pt_PT.properties (#1339)
2020-01-09 08:56:00 -05:00
bundle_ru.properties
Merged in liquid void
2020-01-08 11:04:12 -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
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_zh_CN.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_zh_TW.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle.properties
Merge branch 'master' into crater
2020-01-10 12:02:07 +01:00