Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
eebbf9bbf427382cb0a8023ced0416ee9c032d15
Mindustry/core/assets/bundles
History
Anuken e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
2020-01-10 15:19:07 -05: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
Added setting.bridgeopacity.name (#1347)
2020-01-10 11:17:48 -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' of https://github.com/Anuken/Mindustry into 6.0
2020-01-10 15:19:07 -05:00