Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e11a8565d0054f44f730a5b0db2da95d02b5158b
Mindustry/core/assets/bundles
History
Anuken e11a8565d0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java
2020-10-11 10:51:46 -04:00
..
bundle_be.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_cs.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_da.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_de.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_es.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_et.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_eu.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_fi.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_fil.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_fr_BE.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_fr.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_hu.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_in_ID.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_it.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_ja.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_ko.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_lt.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_nl_BE.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_nl.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_pl.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_pt_BR.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_pt_PT.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_ro.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_ru.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_sv.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_th.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_tk.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_tr.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_uk_UA.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_zh_CN.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle_zh_TW.properties
"cryofluidmixer" to "cryofluid-mixer"fl
2020-09-30 17:54:50 -07:00
bundle.properties
Merge remote-tracking branch 'origin/master'
2020-10-11 10:51:46 -04:00