Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-12-15 15:24:14 -05:00

View File

@ -5,7 +5,7 @@
},
{
"name": "{AA}",
"address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573"]
"address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"]
},
{
"name": "Atanner",
@ -25,7 +25,7 @@
},
{
"name": "Chaotic Neutral",
"address": ["Chaotic-Neutral.ddns.net:5555", "Chaotic-Neutral.ddns.net:6666", "Chaotic-Neutral.ddns.net:7777"]
"address": ["Chaotic-Neutral.ddns.net:1111", "Chaotic-Neutral.ddns.net:5555", "Chaotic-Neutral.ddns.net:6666", "Chaotic-Neutral.ddns.net:7777"]
},
{
"name": "Ranked",