From 589b8d9d3755933b658d626c8df980bc52cda94f Mon Sep 17 00:00:00 2001 From: TheRadioactiveBanana <89061718+TheRadioactiveBanana@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:16:19 +0530 Subject: [PATCH 1/4] Eradication Mindustry Merge (#9310) Anuke finally gave the go ahead --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index e91a506b66..277809e80e 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -133,7 +133,7 @@ }, { "name": "Eradication Mindustry", - "address": ["eradicationmindustry.mindustry.me:6569", "eradicationmindustry.mindustry.me:9547", "eradicationmindustry.mindustry.me:6572", "eradicationmindustry.mindustry.me:6570", "eradicationmindustry.mindustry.me:6571", "eradicationmindustry.mindustry.me:6574", "eradicationmindustry.mindustry.me:6573", "eradicationmindustry.mindustry.me:6568", "eradicationmindustry.mindustry.me:6677", "eradicationmindustry.mindustry.me:6678", "eradicationmindustry.mindustry.me:6675"] + "address": ["140.238.246.78:6569", "140.238.246.78:9547", "140.238.246.78:6572", "140.238.246.78:6570", "140.238.246.78:6571", "140.238.246.78:6574", "140.238.246.78:6573", "140.238.246.78:6568", "140.238.246.78:6677", "140.238.246.78:6678", "140.238.246.78:6675", "130.61.22.183:6573", "130.61.22.183:6599", "130.61.22.183:6774", "130.61.22.183:6777"] }, { "name": "Conservatory", From f9d39ad31a96e6ff4f2ad2c9d134f098636be0a7 Mon Sep 17 00:00:00 2001 From: abcxyzDustry <138785336+abcxyzDustry@users.noreply.github.com> Date: Sun, 26 Nov 2023 00:54:05 +0700 Subject: [PATCH 2/4] Update servers_v7.json (#9315) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 277809e80e..05fb116b2f 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -230,7 +230,7 @@ }, { "name": "ABCXYZ Community", - "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113"] + "address": ["23.88.73.88:23591", "23.88.73.88:23539", "144.76.57.59:14996", "144.76.57.59:16881", "144.76.57.59:13885", "23.88.73.88:32113", "144.76.57.59:9269"] }, { "name": "CroCraft Network", From 8d04a6820d07481f26dd5a86827b29a3b1ee9367 Mon Sep 17 00:00:00 2001 From: OSP <76648940+osp54@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:51:47 +0300 Subject: [PATCH 3/4] Update servers_v7.json (#9318) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 05fb116b2f..acdd3f3b11 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -85,7 +85,7 @@ }, { "name": "XCore", - "address": ["130.61.52.25", "130.61.52.25:6568", "130.61.52.25:6569", "130.61.52.25:6570", "130.61.52.25:6571", "130.61.52.25:6572", "130.61.52.25:6573", "130.61.52.25:6888"] + "address": ["128.140.88.66", "128.140.88.66:6568", "128.140.88.66:6569", "128.140.88.66:6570", "128.140.88.66:6571", "128.140.88.66:6572", "128.140.88.66:6573", "128.140.88.66:6574", "128.140.88.66:6575"] }, { "name": "Chaotic Neutral", From 44f7c726b524e312d5e080bbfa0624ccbe0c129b Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 27 Nov 2023 06:05:57 -0500 Subject: [PATCH 4/4] Revert #9294 --- servers_v7.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index acdd3f3b11..53d0e4d9b4 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -55,10 +55,6 @@ "name": "SynapseOS", "address": ["0nera.ru:7777"] }, - { - "name": "Parallax Network", - "address": ["138.2.177.166","138.2.177.166:3000","138.2.177.166:3001","138.2.177.166:3002","138.2.177.166:3003","138.2.177.166:3004","138.2.177.166:3005"] - }, { "name": "Untitled Mindustry Servers", "address": ["45.144.66.250:6567", "45.144.66.250:6601", "45.144.66.250:6611"]