Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2022-07-04 20:23:08 -04:00
parent 5ce61b863b 4e8736de6c
commit a4e482f55a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/type/Weapon.java
View File

@@ -151,7 +151,7 @@ public class Weapon implements Cloneable{
t.row(); t.row();
t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized()); t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized());
} }
if(reload > 0){ if(!alwaysContinuous && reload > 0){
t.row(); t.row();
t.add("[lightgray]" + Stat.reload.localized() + ": " + (mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / reload * shoot.shots, 2) + " " + StatUnit.perSecond.localized()); t.add("[lightgray]" + Stat.reload.localized() + ": " + (mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / reload * shoot.shots, 2) + " " + StatUnit.perSecond.localized());
} }

2
servers_v6.json
View File

@@ -145,6 +145,6 @@
}, },
{ {
"name": "AAS", "name": "AAS",
"address": ["fi01.optik.host:28453"] "address": ["fi01.optik.host:28453", "n1.yeet.ml:6577"]
} }
] ]