From bebc8f0342085da6a3c470dd54488bb99e15d144 Mon Sep 17 00:00:00 2001 From: L0615T1C5-216AC-9437 <60281819+L0615T1C5-216AC-9437@users.noreply.github.com> Date: Sat, 7 Jan 2023 15:20:11 -0500 Subject: [PATCH 1/7] Remove ports from cn (#8002) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index f425fde7fe..a5a0c1cba2 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -33,7 +33,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", From b3d014cd9f4663bcda2f1670af7a61a62ac003eb Mon Sep 17 00:00:00 2001 From: L0615T1C5-216AC-9437 <60281819+L0615T1C5-216AC-9437@users.noreply.github.com> Date: Sat, 7 Jan 2023 15:20:26 -0500 Subject: [PATCH 2/7] Add more ports to cn (#8003) * Add more ports to cn * Update servers_v7.json --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index cd928a2dc6..41c707e800 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -45,7 +45,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", From 019ffe4c5c66865dee7e2746736844644820c9a7 Mon Sep 17 00:00:00 2001 From: Xasmedy <75242213+Xasmedy@users.noreply.github.com> Date: Sat, 7 Jan 2023 21:29:51 +0100 Subject: [PATCH 3/7] Added the mindustry.ddns.net HUB. (#7911) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 41c707e800..347f280dda 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -89,7 +89,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", From c78adb12aaa0a47d08d67babc28f423a73b0aa53 Mon Sep 17 00:00:00 2001 From: ColaHz <87813567+ColaHz@users.noreply.github.com> Date: Sat, 7 Jan 2023 17:30:51 -0300 Subject: [PATCH 4/7] add new server, servers_v7,json (#8106) * add new server, servers_v7,json * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json Co-authored-by: DHz06 <87813567+DHz06@users.noreply.github.com> --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 347f280dda..ee620592e7 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -63,6 +63,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"] From 832b5e62bf6dfd6cb74d1f08141bdb9d8be8a47e Mon Sep 17 00:00:00 2001 From: Garen7 <22408776+Garen7@users.noreply.github.com> Date: Sat, 7 Jan 2023 15:14:04 -0600 Subject: [PATCH 5/7] Fixes typo on Payload Mass Drivers (#8090) Co-authored-by: Garen7 --- core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } From 51b93205ff3fa5df8c0043922a210345b895ebae Mon Sep 17 00:00:00 2001 From: Valeriy Date: Sun, 8 Jan 2023 07:16:34 +1000 Subject: [PATCH 6/7] SMoA come back (#8064) * SMoA come back * leave from v6 * Fix --- servers_v6.json | 6 +----- servers_v7.json | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index a5a0c1cba2..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"] diff --git a/servers_v7.json b/servers_v7.json index ee620592e7..3c16baf38d 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"] From a4b1d2ca510f5c18de956d8532e8d017623f9a30 Mon Sep 17 00:00:00 2001 From: BeDanGames <92419640+BeDanGames@users.noreply.github.com> Date: Sun, 8 Jan 2023 04:20:18 +0700 Subject: [PATCH 7/7] Update servers_v7.json (#8127) --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 3c16baf38d..849244ecec 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -114,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"] } ]