Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 11:10:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2026-09-07 12:41:19 -04:00
parent 85446f3284 ba93ccfc3e
commit f3cbb54af5
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle_zh_CN.properties
+1 -1
View File
@@ -1106,7 +1106,7 @@ settings.data = 数据
settings.reset = 全部恢复默认 settings.reset = 全部恢复默认
settings.rebind = 重新绑定 settings.rebind = 重新绑定
settings.resetKey = 恢复默认 settings.resetKey = 恢复默认
settings.unbindKey = Unbind settings.unbindKey = 解绑
settings.controls = 控制 settings.controls = 控制
settings.game = 游戏 settings.game = 游戏
settings.sound = 声音 settings.sound = 声音
core/src/mindustry/world/meta/StatValues.java
+4 -1
View File
@@ -736,7 +736,10 @@ public class StatValues{
int count = (int)(b.length / b.lightningSpacing) * 2 + 2; int count = (int)(b.length / b.lightningSpacing) * 2 + 2;
float damage = b.lightningDamage < 0 ? b.damage : b.lightningDamage; float damage = b.lightningDamage < 0 ? b.damage : b.lightningDamage;
sep(bt, Core.bundle.format("bullet.lightning", count, damage)); 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){ if(type instanceof EmpBulletType b && b.radius > 0f){
tests/src/test/java/ModTestAllure.java
+2 -2
View File
@@ -18,8 +18,8 @@ public class ModTestAllure extends GenericModTest{
@Test @Test
public void begin(){ public void begin(){
//As of September 5, the Allure repository has been deleted or made private. I do not know why. //As of September 5, the Allure repository has been deleted or made private. I do not know why.
if(true) return; // Archive version of Allure (archive last pull date: 10 April 2026)
grabMod("https://github.com/LixieWulf/Allure/archive/c94e83e07ab918c0402b8f3897bba832e42432f0.zip"); grabMod("https://github.com/JasonP01/AllureMod/archive/3d580bda58e98f6339e1b746980b66b791f108ee.zip");
checkExistence("allure"); checkExistence("allure");
UnitType type = Vars.content.unit("allure-0b11-exodus"); UnitType type = Vars.content.unit("allure-0b11-exodus");