Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -3543,7 +3543,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_be.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_bg.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_ca.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_cs.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_da.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_de.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_es.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_et.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_eu.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_fi.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_fil.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_fr.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_hu.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = jobb alsó
 name.token.none = nincs
 name.token.warn = figyelmeztetés
 name.token.cross = kereszt
-name.token.blockfall = blokk
+name.token.blockFall = block fall
 name.token.placeBlock = blokk elhelyezése
 name.token.placeBlockSpark = blokkszikra elhelyezése
 name.token.breakBlock = blokk törése

core/assets/bundles/bundle_id_ID.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_it.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_ja.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_ko.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_lt.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_nl.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_nl_BE.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_pl.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_pt_BR.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_pt_PT.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_ro.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_ru.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_sr.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_sv.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_th.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_tk.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_tr.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_uk_UA.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_vi.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/assets/bundles/bundle_zh_CN.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = 右下
 name.token.none = 无
 name.token.warn = 警告
 name.token.cross = x
-name.token.blockfall = block
+name.token.blockFall = 坠落方块
 name.token.placeBlock = 放置建筑
 name.token.placeBlockSpark = 放置建筑火花
 name.token.breakBlock = 拆除方块

core/assets/bundles/bundle_zh_TW.properties

@@ -3538,7 +3538,7 @@ name.token.bottomRight = bottom right
 name.token.none = none
 name.token.warn = warn
 name.token.cross = cross
-name.token.blockfall = block
+name.token.blockFall = block fall
 name.token.placeBlock = place block
 name.token.placeBlockSpark = place block spark
 name.token.breakBlock = break block

core/src/mindustry/ui/dialogs/ModsDialog.java

@@ -238,7 +238,7 @@ public class ModsDialog extends BaseDialog{
                                         (shortDesc.length() > 0 ? "[lightgray]" + shortDesc + "\n" : "")
                                         //so does anybody care about version?
                                         //+ "[gray]v" + Strings.stripColors(trimText(item.meta.version)) + "\n"
-                                        + (mod.enabled() || hideDisabled ? "" : Core.bundle.get("mod.disabled") + ""))
+                                        + (mod.enabled() || hideDisabled ? "" : Core.bundle.get(mod.failed() ? "mod.failed" : "mod.disabled")))
                                     .wrap().top().width(300f).growX().left();
 
                                     text.row();