diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index bc3ae10065..32e21c5af2 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1106,7 +1106,7 @@ settings.data = 数据 settings.reset = 全部恢复默认 settings.rebind = 重新绑定 settings.resetKey = 恢复默认 -settings.unbindKey = Unbind +settings.unbindKey = 解绑 settings.controls = 控制 settings.game = 游戏 settings.sound = 声音 diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index b01f2f3427..c210293c5f 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -736,7 +736,10 @@ public class StatValues{ int count = (int)(b.length / b.lightningSpacing) * 2 + 2; float damage = b.lightningDamage < 0 ? b.damage : b.lightningDamage; sep(bt, Core.bundle.format("bullet.lightning", count, damage)); - note(bt, Core.bundle.format("bullet.lightninginterval", Strings.autoFixed(b.lightningSpacing / tilesize, 2), Strings.autoFixed(b.lightningLength, 2))).left(); + String length = b.lightningLengthRand > 0 ? + Strings.format("@[]-[stat]@", Strings.autoFixed(b.lightningLength, 2), Strings.autoFixed(b.lightningLength + b.lightningLengthRand, 2)) + : Strings.autoFixed(b.lightningLength, 2); + note(bt, Core.bundle.format("bullet.lightninginterval", Strings.autoFixed(b.lightningSpacing / tilesize, 2), length)).left(); } if(type instanceof EmpBulletType b && b.radius > 0f){ diff --git a/tests/src/test/java/ModTestAllure.java b/tests/src/test/java/ModTestAllure.java index 64e5f2cb1c..9b95054d1b 100644 --- a/tests/src/test/java/ModTestAllure.java +++ b/tests/src/test/java/ModTestAllure.java @@ -18,8 +18,8 @@ public class ModTestAllure extends GenericModTest{ @Test public void begin(){ //As of September 5, the Allure repository has been deleted or made private. I do not know why. - if(true) return; - grabMod("https://github.com/LixieWulf/Allure/archive/c94e83e07ab918c0402b8f3897bba832e42432f0.zip"); + // Archive version of Allure (archive last pull date: 10 April 2026) + grabMod("https://github.com/JasonP01/AllureMod/archive/3d580bda58e98f6339e1b746980b66b791f108ee.zip"); checkExistence("allure"); UnitType type = Vars.content.unit("allure-0b11-exodus");