Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8a089ba3c9919d38bbdedf88c7afbac58373935b
Mindustry/core/assets/bundles
History
Patrick 'Quezler' Mounier 8a089ba3c9 Resolve conflicts 
# 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
2019-11-12 08:44:26 +01:00
..
bundle_cs.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_de.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_es.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_et.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_eu.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_fr_BE.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_fr.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_in_ID.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_it.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_ja.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_ko.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_nl_BE.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_nl.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_pl.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_pt_BR.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_pt.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_ru.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_sv.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_tk.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_tr.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_uk_UA.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_zh_CN.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle_zh_TW.properties
Updated bundles
2019-11-05 19:03:14 -05:00
bundle.properties
Resolve conflicts
2019-11-12 08:44:26 +01:00