From 6ef21f65b253d1f0d8c2d3fab391e58bb1dbc976 Mon Sep 17 00:00:00 2001
From: VaporSpace2 <92970384+VaporSpace2@users.noreply.github.com>
Date: Sat, 7 Jan 2023 14:22:55 -0700
Subject: [PATCH 1/3] updates to GMS server network (#8059)

adding the new "Generic PvP server" to v7 server list, renamed server network to "generic mindustry"
---
 servers_v7.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 849244ecec..08c1354438 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -1,7 +1,7 @@
 [
   {
-    "name": "generic survival",
-    "address": ["212.192.29.92:25554"]
+    "name": "generic mindustry",
+    "address": ["212.192.29.92:25554", "212.192.29.24:25298"]
   },
   {
     "name": "Mindustry Español",

From 2f0de58d00a25af227be1a6b92d0ae30abfbaa0a Mon Sep 17 00:00:00 2001
From: OGalaxy <112196968+TheTrueInfinity@users.noreply.github.com>
Date: Sun, 8 Jan 2023 02:40:41 +0300
Subject: [PATCH 2/3] Update servers_v7.json (#8118)

---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v7.json b/servers_v7.json
index 08c1354438..564b292ef5 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -81,7 +81,7 @@
   },
   {
     "name": "OMNIDUSTRY",
-    "address": ["109.94.209.233","109.94.209.233:6568","109.94.209.233:6569","109.94.209.233:6570","109.94.209.233:6571","109.94.209.233:6572","109.94.209.233:6573"]
+    "address": ["109.94.209.233","109.94.209.233:6568","109.94.209.233:6569","109.94.209.233:6570","109.94.209.233:6571","109.94.209.233:6572","109.94.209.233:6573","109.94.209.233:6574"]
   },
   {
     "name": "The Devil",

From 85229f15c403fcb6b0f37352cdaf51596cddb217 Mon Sep 17 00:00:00 2001
From: "Mr.S" <75036456+MrS-1302@users.noreply.github.com>
Date: Sun, 8 Jan 2023 00:49:20 +0100
Subject: [PATCH 3/3] Update servers_v6.json (#8082)

Server upgrade to V7

Co-authored-by: Anuken <arnukren@gmail.com>
---
 servers_v6.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/servers_v6.json b/servers_v6.json
index f078adc6c3..5c724f7007 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -87,10 +87,6 @@
     "name": "M-DE",
     "address": ["mindustry.inc.li", "mindustry.inc.li:6568"]
   },
-  {
-    "name": "Hungarian",
-    "address": ["play.hudustry.tk"]
-  },
   {
     "name": "CxZx",
     "address": ["usfr2.forcehost.net:25578"]