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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-02-09 12:10:22 -05:00
parent 0d0aef3dea 386da22f6e
commit ce8b32f022
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/meta/StatUnit.java
View File

@@ -20,7 +20,7 @@ public enum StatUnit{
minutes, minutes,
perSecond, perSecond,
perMinute, perMinute,
perShot, perShot(false),
timesSpeed(false), timesSpeed(false),
percent(false), percent(false),
shieldHealth, shieldHealth,

4
servers_v6.json
View File

@@ -1,4 +1,8 @@
[ [
{
"name": "RCR",
"address": ["rcr.fvds.ru"]
},
{ {
"name": "mindustry.pl", "name": "mindustry.pl",
"address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"] "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"]