From fc91b6b135c54851245d01e52a9283b32b732cfa Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 23 Jan 2021 12:29:36 -0800
Subject: [PATCH 1/3] Colored construct (#4417)

---
 core/src/mindustry/graphics/Drawf.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java
index 83d9065281..e38fa74c82 100644
--- a/core/src/mindustry/graphics/Drawf.java
+++ b/core/src/mindustry/graphics/Drawf.java
@@ -221,9 +221,13 @@ public class Drawf{
     }
 
     public static void construct(float x, float y, TextureRegion region, float rotation, float progress, float speed, float time){
+        construct(x, y, region, Pal.accent, rotation, progress, speed, time);
+    }
+    
+    public static void construct(float x, float y, TextureRegion region, Color color, float rotation, float progress, float speed, float time){
         Shaders.build.region = region;
         Shaders.build.progress = progress;
-        Shaders.build.color.set(Pal.accent);
+        Shaders.build.color.set(color);
         Shaders.build.color.a = speed;
         Shaders.build.time = -time / 20f;
 
@@ -235,9 +239,13 @@ public class Drawf{
     }
 
     public static void construct(Building t, TextureRegion region, float rotation, float progress, float speed, float time){
+        construct(t, region, Pal.accent, rotation, progress, speed, time);
+    }
+        
+    public static void construct(Building t, TextureRegion region, Color color, float rotation, float progress, float speed, float time){
         Shaders.build.region = region;
         Shaders.build.progress = progress;
-        Shaders.build.color.set(Pal.accent);
+        Shaders.build.color.set(color);
         Shaders.build.color.a = speed;
         Shaders.build.time = -time / 20f;
 

From 6b6d52e2fd36d6f6996e05f6ab2fe7bf0cb3ca9d Mon Sep 17 00:00:00 2001
From: _owler_#0954 <63801085+owler0954@users.noreply.github.com>
Date: Sun, 24 Jan 2021 17:22:44 +0300
Subject: [PATCH 2/3] Add new minigame (#4427)

PvP version of tower defence
---
 servers_v6.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v6.json b/servers_v6.json
index fcc68297ac..67d025e65c 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -61,7 +61,7 @@
   },
   {
     "name": "Minigames",
-    "address": ["shizashizashiza.ml"]
+    "address": ["shizashizashiza.ml", "shizashizashiza.ml:6568"]
   },
   {
     "name": "Korea",

From 623b7ada11003a4552c1d8a1acf52d486d459360 Mon Sep 17 00:00:00 2001
From: genNAowl <68400583+genNAowl@users.noreply.github.com>
Date: Sun, 24 Jan 2021 06:23:12 -0800
Subject: [PATCH 3/3] Let Logic Sense Range (#4425)

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
---
 core/src/mindustry/entities/comp/BuildingComp.java | 1 +
 core/src/mindustry/entities/comp/UnitComp.java     | 1 +
 core/src/mindustry/logic/LAccess.java              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 31a7ed8ce0..76824b6cc3 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1306,6 +1306,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             case health -> health;
             case maxHealth -> maxHealth;
             case efficiency -> efficiency();
+            case range -> this instanceof Ranged r ? r.range() / tilesize : 0;
             case rotation -> rotation;
             case totalItems -> items == null ? 0 : items.total();
             case totalLiquids -> liquids == null ? 0 : liquids.total();
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 7d8df00b89..753b03f248 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -130,6 +130,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             case y -> World.conv(y);
             case team -> team.id;
             case shooting -> isShooting() ? 1 : 0;
+            case range -> range() / tilesize;
             case shootX -> World.conv(aimX());
             case shootY -> World.conv(aimY());
             case mining -> mining() ? 1 : 0;
diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java
index 0c0597c6a1..6dcf46e140 100644
--- a/core/src/mindustry/logic/LAccess.java
+++ b/core/src/mindustry/logic/LAccess.java
@@ -26,6 +26,7 @@ public enum LAccess{
     y,
     shootX,
     shootY,
+    range, 
     shooting,
     mineX,
     mineY,