Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a48911b983369a44709215d5ebd4039df88eac69
Mindustry/core/assets/bundles
History
Anuken a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
2021-11-22 12:11:31 -05:00
..
bundle_be.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_bg.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_cs.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_da.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_de.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_es.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_et.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_eu.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_fi.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_fil.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_fr.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_hu.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_in_ID.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_it.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_ja.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_ko.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_lt.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_nl_BE.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_nl.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_pl.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_pt_BR.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_pt_PT.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_ro.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_ru.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_sr.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_sv.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_th.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_tk.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_tr.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_uk_UA.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_vi.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_zh_CN.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle_zh_TW.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-11-22 12:11:31 -05:00
bundle.properties
Test fixes / Building module presence saving
2021-11-17 10:58:36 -05:00