diff --git a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java index 151d35f01e..314e77d5f7 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java @@ -79,7 +79,7 @@ public class PayloadMassDriver extends PayloadBlock{ super.setStats(); stats.add(Stat.payloadCapacity, StatValues.squared(maxPayloadSize, StatUnit.blocksSquared)); - stats.add(Stat.reload, 60f / (chargeTime + reload), StatUnit.seconds); + stats.add(Stat.reload, 60f / (chargeTime + reload), StatUnit.perSecond); stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks); } diff --git a/servers_v6.json b/servers_v6.json index f425fde7fe..f078adc6c3 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -11,14 +11,10 @@ "name": "EasyPlay", "address": ["easyplay.su"] }, - { + { "name": "Tendhost", "address": ["tendhost.ddns.net", "smokeofanarchy.ru:7576"] }, - { - "name": "SMokeOfAnarchy", - "address": ["smokeofanarchy.ru:6566", "2.smokeofanarchy.ru:7656"] - }, { "name": "Atanner Gaming", "address": ["mindustry.atannergaming.com:6567", "mindustry.atannergaming.com:6700", "mindustry.atannergaming.com:9000"] @@ -33,7 +29,7 @@ }, { "name": "Chaotic Neutral", - "address": ["c-n.ddns.net:1111", "c-n.ddns.net:2222", "c-n.ddns.net:3333", "c-n.ddns.net:4444"] + "address": ["c-n.ddns.net:1111", "c-n.ddns.net:2222", "c-n.ddns.net:3333"] }, { "name": "Ranked", diff --git a/servers_v7.json b/servers_v7.json index cd928a2dc6..849244ecec 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -7,6 +7,10 @@ "name": "Mindustry Español", "address": ["mes.xpdustry.fr"] }, + { + "name": "SMoke of Anarchy", + "address": ["smokeofanarchy.ru, backup.smokeofanarchy.ru"] + }, { "name": "mindustry.pl", "address": ["0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000", "1.baseduser.eu.org:6966", "1.baseduser.eu.org:6666", "1.baseduser.eu.org:6000"] @@ -45,7 +49,7 @@ }, { "name": "Chaotic Neutral", - "address": ["c-n.ddns.net:5555", "c-n.ddns.net:6666", "c-n.ddns.net:7777", "c-n.ddns.net:8888"] + "address": ["c-n.ddns.net:1111", "c-n.ddns.net:2222", "c-n.ddns.net:3333", "c-n.ddns.net:4444", "c-n.ddns.net:5555", "c-n.ddns.net:6666", "c-n.ddns.net:7777", "c-n.ddns.net:8888"] }, { "name": "io", @@ -63,6 +67,10 @@ "name": "Xpdustry", "address": ["lobby.md.xpdustry.fr", "survival.md.xpdustry.fr", "router.md.xpdustry.fr", "pvp.md.xpdustry.fr", "sandbox.md.xpdustry.fr", "attack.md.xpdustry.fr", "event.md.xpdustry.fr"] }, + { + "name": "LatamDustry", + "address": ["n1.xpdustry.fr:7003", "n1.xpdustry.fr:7004", "n1.xpdustry.fr:7005", "n1.xpdustry.fr:7006", "n1.xpdustry.fr:7007"] + }, { "name": "Pandorum", "address": ["pandorum.su:5018", "pandorum.su:5019", "pandorum.su:5020"] @@ -89,7 +97,7 @@ }, { "name": "mindustry.ddns.net", - "address": ["mindustry.ddns.net:1000", "mindustry.ddns.net:2000", "mindustry.ddns.net:3000", "mindustry.ddns.net:4000"] + "address": ["mindustry.ddns.net", "mindustry.ddns.net:1000", "mindustry.ddns.net:2000", "mindustry.ddns.net:3000", "mindustry.ddns.net:4000"] }, { "name": "EasyPlay.su", @@ -106,5 +114,9 @@ { "name": "Sakura", "address": ["160.16.207.141:22527", "160.16.207.141:23527", "160.16.207.141:24527", "160.16.207.141:25527", "160.16.207.141:26527"] + }, + { + "name": "|RussianServers|[]", + "address": ["2p2g.ml:6568","2p2g.ml:6569","2p2g.ml:6570","2p2g.ml:6571","2p2g.ml:6572","2p2g.ml:6573"] } ]