From 7dce2ee9ec177d6b7a1e53206650c11934dc1ef2 Mon Sep 17 00:00:00 2001
From: buthed010203 <naguiar010203@gmail.com>
Date: Fri, 4 Feb 2022 18:53:14 -0500
Subject: [PATCH 1/4] Do not the overlap. (#6555)

I got sick of waiting for this to get patched in vanilla so I did it myself.
---
 core/src/mindustry/core/UI.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 49b5afcdda..5253fc9c68 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -303,6 +303,7 @@ public class UI implements ApplicationListener, Loadable{
         Table table = new Table();
         table.touchable = Touchable.disabled;
         table.setFillParent(true);
+        table.marginTop(Core.scene.find("coreinfo").getPrefHeight() / Scl.scl() / 2);
         table.actions(Actions.fadeOut(7f, Interp.fade), Actions.remove());
         table.top().add(info).style(Styles.outlineLabel).padTop(10);
         Core.scene.add(table);
@@ -311,8 +312,9 @@ public class UI implements ApplicationListener, Loadable{
     /** Shows a fading label at the top of the screen. */
     public void showInfoToast(String info, float duration){
         Table table = new Table();
-        table.setFillParent(true);
         table.touchable = Touchable.disabled;
+        table.setFillParent(true);
+        table.marginTop(Core.scene.find("coreinfo").getPrefHeight() / Scl.scl() / 2);
         table.update(() -> {
             if(state.isMenu()) table.remove();
         });

From 126baa93d782a917981c57920b1be53d9134d835 Mon Sep 17 00:00:00 2001
From: Sunny Kim <58885089+sk7725@users.noreply.github.com>
Date: Sun, 6 Feb 2022 01:14:43 +0900
Subject: [PATCH 2/4] Save fires from color (#6556)

---
 core/src/mindustry/entities/comp/FireComp.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/entities/comp/FireComp.java b/core/src/mindustry/entities/comp/FireComp.java
index 88470707dd..bdb8ec33aa 100644
--- a/core/src/mindustry/entities/comp/FireComp.java
+++ b/core/src/mindustry/entities/comp/FireComp.java
@@ -1,6 +1,7 @@
 package mindustry.entities.comp;
 
 import arc.*;
+import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
@@ -115,7 +116,7 @@ abstract class FireComp implements Timedc, Posc, Syncc, Drawc{
             }
         }
 
-        Draw.alpha(Mathf.clamp(warmup / warmupDuration));
+        Draw.color(Color.white, Mathf.clamp(warmup / warmupDuration));
         Draw.z(Layer.effect);
         Draw.rect(regions[Math.min((int)animation, regions.length - 1)], x + Mathf.randomSeedRange((int)y, 2), y + Mathf.randomSeedRange((int)x, 2));
         Draw.reset();

From c877c3416edf7002cc28a5a10fa5e9e93826b0a2 Mon Sep 17 00:00:00 2001
From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 5 Feb 2022 13:03:32 -0800
Subject: [PATCH 3/4] Reset after drawing bullet. (#6557)

---
 core/src/mindustry/entities/comp/BulletComp.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java
index 788cfaeb8c..4193a823b6 100644
--- a/core/src/mindustry/entities/comp/BulletComp.java
+++ b/core/src/mindustry/entities/comp/BulletComp.java
@@ -200,6 +200,8 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
 
         type.draw(self());
         type.drawLight(self());
+        
+        Draw.reset();
     }
 
     public void initVel(float angle, float amount){

From 6a053f2f45649cb038eed1de074571cdb10bbb70 Mon Sep 17 00:00:00 2001
From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sat, 5 Feb 2022 14:58:36 -0800
Subject: [PATCH 4/4] Allow for same-size core upgrades (#6558)

---
 core/src/mindustry/world/blocks/storage/CoreBlock.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index a24b92e47b..7618586270 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -116,7 +116,7 @@ public class CoreBlock extends StorageBlock{
     @Override
     public boolean canReplace(Block other){
         //coreblocks can upgrade smaller cores
-        return super.canReplace(other) || (other instanceof CoreBlock && size > other.size);
+        return super.canReplace(other) || (other instanceof CoreBlock && size >= other.size && other != this);
     }
 
     @Override