Merge branch 'master' into patch-3

This commit is contained in:
Anuken
2020-10-12 16:20:13 -04:00
committed by GitHub
782 changed files with 37280 additions and 22046 deletions
+9 -9
View File
@@ -8,15 +8,6 @@
{
"address": "mindustry.nydus.app:1337"
},
{
"address": "mindustry.ecansol.com:6597"
},
{
"address": "mindustry.ecansol.com:6499"
},
{
"address": "mindustry.ecansol.com:6599"
},
{
"address": "mindustry.ru"
},
@@ -47,6 +38,9 @@
{
"address": "aamindustry.play.ai:6569"
},
{
"address": "aamindustry.play.ai:6570"
},
{
"address": "mindustry.atannergaming.com"
},
@@ -79,5 +73,11 @@
},
{
"address": "Chaotic-Neutral.ddns.net:3333"
},
{
"address": "pandorum.su:9999"
},
{
"address": "mindustryranked.ddns.net"
}
]