Merge remote-tracking branch 'origin/master'

2025-07-21 13:17:39 +07:00 · 2021-02-09 12:10:22 -05:00
parent 0d0aef3dea 386da22f6e
commit ce8b32f022
2 changed files with 6 additions and 2 deletions
--- a/core/src/mindustry/world/meta/StatUnit.java
+++ b/core/src/mindustry/world/meta/StatUnit.java
@ -20,7 +20,7 @@ public enum StatUnit{
    minutes,
    perSecond,
    perMinute,
-    perShot,
+    perShot(false),
    timesSpeed(false),
    percent(false),
    shieldHealth,
--- a/servers_v6.json
+++ b/servers_v6.json
@ -1,4 +1,8 @@
-[
+[ 
+  {
+    "name": "RCR",
+    "address": ["rcr.fvds.ru"]
+  },
  {
    "name": "mindustry.pl",
    "address": ["mindustry.pl:6000", "mindustry.pl:6666", "mindustry.pl"]