Merge branch 'master' into master

2020-08-26 20:29:05 -04:00
parent 5ecfb7c51d bac8c20b0b
commit c3fbecf858
353 changed files with 14409 additions and 10976 deletions
--- a/servers_be.json
+++ b/servers_be.json
@@ -5,6 +5,9 @@
  {
    "address": "nydustry.nydus.app:6060"
  },
+  {
+    "address": "mindustry.pl:6000"
+  },
  {
    "address": "routerchain.ddns.net"
  }