From 553bc1d1c8197ca3c0abc55edec13048cf08ea8e Mon Sep 17 00:00:00 2001 From: MWestfall Date: Thu, 17 Sep 2020 10:34:19 -0400 Subject: [PATCH 1/5] Update servers.json --- servers.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/servers.json b/servers.json index 07226a273f..c0b3bae268 100644 --- a/servers.json +++ b/servers.json @@ -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" }, From d4811a7d047b89b2f21cd0b49a83e4ddd38b1b93 Mon Sep 17 00:00:00 2001 From: MWestfall Date: Thu, 17 Sep 2020 10:36:48 -0400 Subject: [PATCH 2/5] Update servers_v6.json ECAN Moving to V6 --- servers_v6.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index adcfa052dd..88014a6ce2 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -10,5 +10,14 @@ }, { "address": "pandorum.su:8000" + }, + { + "address": "mindustry.ecansol.com:6597" + }, + { + "address": "mindustry.ecansol.com:6499" + }, + { + "address": "mindustry.ecansol.com:6599" } ] From 9f5e96ff8a5b828f5ff1f854df2b71998994af9a Mon Sep 17 00:00:00 2001 From: AydenRennaker Date: Sun, 20 Sep 2020 22:56:11 -0600 Subject: [PATCH 3/5] Add Atanner Gaming V6 Server Auto Updating server to latest bleeding edge build. --- servers_v6.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index adcfa052dd..0d3828152e 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -8,6 +8,9 @@ { "address": "routerchain.ddns.net" }, + { + "address": "mindustry.atannergaming.com:13000" + }, { "address": "pandorum.su:8000" } From ae78054188acac52e1f5b224f48014512f1abb8b Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 23 Sep 2020 18:37:45 -0400 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca66d67e1e..ffb4764520 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,11 +39,11 @@ deploy: on: repo: Anuken/Mindustry tags: true -- provider: script - script: bash update_wiki.sh - on: - repo: Anuken/Mindustry - tags: true +#- provider: script + #script: bash update_wiki.sh + # on: + # repo: Anuken/Mindustry + # tags: true env: global: - secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8= From abd83563850cc0ac16c00818b6d8ddb795474c60 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 23 Sep 2020 18:47:29 -0400 Subject: [PATCH 5/5] Update .travis.yml --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ffb4764520..6b1dfd72ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,10 @@ deploy: repo: Anuken/Mindustry tags: true #- provider: script - #script: bash update_wiki.sh - # on: - # repo: Anuken/Mindustry - # tags: true +# script: bash update_wiki.sh +# on: +# repo: Anuken/Mindustry +# tags: true env: global: - secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=