From 235fee091ed867dd7edaad8ab0161b60adc26565 Mon Sep 17 00:00:00 2001
From: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Date: Wed, 28 Jul 2021 06:08:29 +0900
Subject: [PATCH 1/2] keep v6 mod compatibility (#5655)

---
 core/src/mindustry/world/Block.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 94732f338a..ee354135ac 100644
--- a/core/src/mindustry/world/Block.java
+++ b/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);

From 3d3e33912e5a2e1087946858ad6c6b5d9f9dd8d6 Mon Sep 17 00:00:00 2001
From: Volas171 <60143910+Volas171@users.noreply.github.com>
Date: Tue, 27 Jul 2021 16:09:50 -0500
Subject: [PATCH 2/2] Mindustry Reborn CAMS (update servers_v7.json) (#5651)

* CAMS

* space
---
 servers_v7.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/servers_v7.json b/servers_v7.json
index 9e6ad5f4ab..7d7c41026f 100644
--- a/servers_v7.json
+++ b/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"]