mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 16:37:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2021-03-30 10:24:57 -04:00
commit 2096d006be
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/meta/values/AmmoListValue.java
View File

@ -45,7 +45,7 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){ if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
if(type.continuousDamage() > 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{ }else{
bt.add(Core.bundle.format("bullet.damage", type.damage)); bt.add(Core.bundle.format("bullet.damage", type.damage));
} }

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=8bbe80acf688567b55aa549bf19d6aa76b2a0796 archash=c3e170325ca836f1939653ffbc01e76de9c6eb35