Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/Block.java

@@ -793,6 +793,11 @@ public class Block extends UnlockableContent{
         }
 
         clipSize = Math.max(clipSize, size * tilesize);
+        
+        //only kept to ensure compatibility with v6 mods.
+        if(expanded){
+            clipSize += tilesize * 10f;
+        }
 
         if(emitLight){
             clipSize = Math.max(clipSize, lightRadius * 2f);

servers_v7.json

@@ -5,16 +5,12 @@
   },
   {
     "name": "C.A.M.S.",
-    "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua"]
+    "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "mindustry.me:7000"]
   },
   {
     "name": "hexpvp.ml",
     "address": "hexpvp.ml"
   },
-  {
-    "name": "[accent]Mindustry [red]Reborn",
-    "address": "mindustry.me:7000"
-  },
   {
     "name": "Omega",
     "address": ["185.86.230.61:25571", "185.86.230.61:25570", "185.86.230.62:25572"]