From 56b87a21418fd3490d6742de871bdd07058b9883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=82=A4=EC=97=90=EB=A5=B4?=
 <44261958+Kieaer@users.noreply.github.com>
Date: Thu, 21 Jan 2021 23:13:07 +0900
Subject: [PATCH 1/4] Add kr server (#4378)

* Add kr server

* Update servers_v6.json

Co-authored-by: Blockzilla101 <48705529+Blockzilla101@users.noreply.github.com>

Co-authored-by: Blockzilla101 <48705529+Blockzilla101@users.noreply.github.com>
---
 servers_v6.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v6.json b/servers_v6.json
index 173aba03e7..5959364a9d 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -62,5 +62,9 @@
   {
     "name": "Minigames",
     "address": ["shizashizashiza.ml"]
+  },
+  {
+    "name": "Korea",
+    "address": ["mindustry.kr"]
   }
 ]

From 1fb608220fecf48437bb5c77311d303bc6855017 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Thu, 21 Jan 2021 15:30:25 +0100
Subject: [PATCH 2/4] Make impact reactor warmup sensable as heat (#4399)

* Make impact reactor warmup sensable as heat

* Update ImpactReactor.java
---
 core/src/mindustry/world/blocks/power/ImpactReactor.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java
index 22c95a9089..7ecffccd1c 100644
--- a/core/src/mindustry/world/blocks/power/ImpactReactor.java
+++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java
@@ -12,6 +12,7 @@ import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.ui.*;
 import mindustry.world.meta.*;
 
@@ -121,6 +122,12 @@ public class ImpactReactor extends PowerGenerator{
         public void drawLight(){
             Drawf.light(team, x, y, (110f + Mathf.absin(5, 5f)) * warmup, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * warmup);
         }
+        
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.heat) return warmup;
+            return super.sense(sensor);
+        }
 
         @Override
         public void onDestroyed(){

From 988791f18df3561fe758029617a27990707e8492 Mon Sep 17 00:00:00 2001
From: genNAowl <68400583+genNAowl@users.noreply.github.com>
Date: Thu, 21 Jan 2021 06:30:36 -0800
Subject: [PATCH 3/4] Let Logic set (and read) Illuminator Color  (#4374)

* illluminator color logic control

* remove sense

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
---
 core/src/mindustry/logic/LAccess.java                 |  3 ++-
 core/src/mindustry/world/blocks/power/LightBlock.java | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java
index 0daf9ae83f..0c0597c6a1 100644
--- a/core/src/mindustry/logic/LAccess.java
+++ b/core/src/mindustry/logic/LAccess.java
@@ -44,7 +44,8 @@ public enum LAccess{
     enabled("to"), //"to" is standard for single parameter access
     shoot("x", "y", "shoot"),
     shootp(true, "unit", "shoot"),
-    configure(true, 30, "to");
+    configure(true, 30, "to"),
+    color("r", "g", "b");
 
     public final String[] params;
     public final boolean isObj;
diff --git a/core/src/mindustry/world/blocks/power/LightBlock.java b/core/src/mindustry/world/blocks/power/LightBlock.java
index 6d55d0ac09..8f035689b9 100644
--- a/core/src/mindustry/world/blocks/power/LightBlock.java
+++ b/core/src/mindustry/world/blocks/power/LightBlock.java
@@ -9,6 +9,7 @@ import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
@@ -32,6 +33,15 @@ public class LightBlock extends Block{
         public int color = Pal.accent.rgba();
         public float smoothTime = 1f;
 
+        @Override
+        public void control(LAccess type, double p1, double p2, double p3, double p4){
+            if(type == LAccess.color){
+                color = Color.rgba8888((float)p1, (float)p2, (float)p3, 1f);
+            }
+
+            super.control(type, p1, p2, p3, p4);
+        }
+
         @Override
         public void draw(){
             super.draw();

From 613b5a7703c1928c683077f00eee853b57b740bc Mon Sep 17 00:00:00 2001
From: Nikopol <53965568+KirillcraftEX@users.noreply.github.com>
Date: Thu, 21 Jan 2021 19:54:24 +0400
Subject: [PATCH 4/4] Update servers_v6.json (#4401)

---
 servers_v6.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers_v6.json b/servers_v6.json
index 5959364a9d..fcc68297ac 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -66,5 +66,9 @@
   {
     "name": "Korea",
     "address": ["mindustry.kr"]
+  },
+  {
+    "name": "NikoCHIO",
+    "address": ["nikochio.ddns.net"]
   }
 ]