Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9f5a183793f8f77f56185370a1fa3dc43916e73f
Mindustry/core/assets/bundles
History
beito123 9f5a183793 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
2019-05-02 20:08:10 +09:00
..
bundle_cs.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_de.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_es.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_fr_BE.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_fr.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_in_ID.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_it.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_ja.properties
Merge remote-tracking branch 'upstream/master'
2019-05-02 20:08:10 +09:00
bundle_ko.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_nl_BE.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_nl.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_pl.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_pt_BR.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_ru.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_tk.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_tr.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_uk_UA.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_zh_CN.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle_zh_TW.properties
Pruned bundles
2019-04-30 23:34:41 -04:00
bundle.properties
fix #481 + capitalization (#483)
2019-05-01 15:40:37 -04:00