From 7f3b8f7e565cec83997804e0b01d707e39162af3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 29 Mar 2021 20:35:07 -0400 Subject: [PATCH 1/2] jitpack is dead --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a9abe3e4ce..11e25f6aaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=8bbe80acf688567b55aa549bf19d6aa76b2a0796 +archash=c3e170325ca836f1939653ffbc01e76de9c6eb35 From 7a0e772a05d79e4cf333b07b5d8f2d6811394469 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 30 Mar 2021 07:22:08 -0700 Subject: [PATCH 2/2] Remove space between `damage` and `/sec` (#5024) --- core/src/mindustry/world/meta/values/AmmoListValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java index 406d20a598..9a72a85a24 100644 --- a/core/src/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/mindustry/world/meta/values/AmmoListValue.java @@ -45,7 +45,7 @@ public class AmmoListValue implements StatValue{ if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){ if(type.continuousDamage() > 0){ - bt.add(Core.bundle.format("bullet.damage", type.continuousDamage()) + " " + StatUnit.perSecond.localized()); + bt.add(Core.bundle.format("bullet.damage", type.continuousDamage()) + StatUnit.perSecond.localized()); }else{ bt.add(Core.bundle.format("bullet.damage", type.damage)); }