From 7555d434187ffebf8e3bd8c326658eaf312bb441 Mon Sep 17 00:00:00 2001
From: alex <67626131+alexpvpmindustry@users.noreply.github.com>
Date: Mon, 28 Dec 2020 11:29:35 +0800
Subject: [PATCH 1/5] Update servers_v6.json (#4148)

changed the port number for our attack server.
sorry for the inconvenience, i don't have control over the port number of this "alexmindustryattac.ddns.net" hosted server.
---
 servers_v6.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_v6.json b/servers_v6.json
index 895cc5913d..ff486ea497 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -53,7 +53,7 @@
   },
   {
     "name": "ALEX",
-    "address": ["alexmindustryhub.ddns.net:6568", "alexmindustry.ddns.net:6568", "alexmindustry.ddns.net:6569", "alexmindustryattac.ddns.net:2293"]
+    "address": ["alexmindustryhub.ddns.net:6568", "alexmindustry.ddns.net:6568", "alexmindustry.ddns.net:6569", "alexmindustryattac.ddns.net:25800"]
   },
   {
     "name": "Minty [subzero]",

From 6eb604585bd7f1492d1f3405582253e845333b50 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 28 Dec 2020 15:38:34 +0100
Subject: [PATCH 2/5] Removed packed sprite section from CONTRIBUTING.md
 (#4152)

---
 CONTRIBUTING.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8b4ec3bf55..64bd54bd56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,9 +15,6 @@ If you are submitting a new block, make sure it has a name and description, and
 If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*).  
 For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it.
 
-### Do not include packed sprites in your pull request.
-When making a pull request that changes or adds new sprites, do not add the modified atlas & `spritesX.png` files to your final pull request. These are a frequent source of conflicts.
-
 
 ## Style Guidelines
 

From e714d44a0ed8c2de03597146a39acaea7e5ceb05 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 28 Dec 2020 15:38:58 +0100
Subject: [PATCH 3/5] Return large launchpad item costs (#4134)

* Return large launchpad item costs

hidden -> debugonly

* Remove the 4 orange squares from the large launch pad

Leaving the lights and launchpod alignments alone since that is campaign only.
---
 .../blocks/campaign/launch-pad-large.png      | Bin 1233 -> 7938 bytes
 core/src/mindustry/content/Blocks.java        |   1 +
 2 files changed, 1 insertion(+)

diff --git a/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png b/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png
index ac04aef1c461416dec3f9b63f1e9cfbdcff9b2b8..ac77dbe43c5d8a1ab3c8e8ac1a22a20d3b775cc7 100644
GIT binary patch
literal 7938
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
AbN~PV

delta 1214
zcmZp&yT~~~xt?W)r;B4q#jUq@ttSZ^3N$3%pRUz4foBJ+>lwxlj*cCNi@5YQPGJt;
zd8W!O>uYrVf`TU(zigkkb(d=FzPjK4s_xhQ`StczT)dsE+1r0%(O-USx&2hI!JO$V
zdx~sLcQq3O!zacME(^Xk>}gtG8~>2uUj2_fx(vP9(F{Aba<E9%^LuDlh;eu^b~G?F
zv@qBRuCY^iyP)zrI|IWLmItj244sS>4h#;A4AbmI83QB^Z0(Kvzvl1HPwzIYjhnxB
z|JCQ)f3;W4{JSBCBaON2%KWr=xr6mR+zbo}+zQG}o)_ePUwNUd^<(w==1hj`-Mbhr
zWXxo^^C+3`!8Id=6C4U!KkDBxY*A!bpuuqV`k^<6PqQf){dmccv1Px#{j|JEhSOOX
znC3oM@5JDs%pk<EkilVr{GUh`1_lRzhN%J(z4g@$Hx(oLr5QXGEBbbtHf(MQ{<_R?
z-!z6a<Ni?Q^@jVx7?!MjuE(JAIEOi5>%RrwAJUJn<V!I7Sr~R=24_RqvUObb4be4e
zvp5a}x@NaMh@P66>QG>&7S53G*unB3ur;SNUWj4wM?>}kenq7p^HN`2`)+Zm-^A`2
z!#dqxuMHOY-4{NPRda|j<Bv{POh;1XedY7(Oc_oesGgP+>BqB`L1CuU)m1Y;$E{gt
zYr2Nd!AP*=%EHj1Bib7G=9|v`V|DnoRlV>J9)}dqkR$KQvsu2M|MDhUJ4Ne<WJ4%N
zB$Gg?e7^1J&DTRS^d3kua5m+{@4xr`%Nxsif9DI$<LP3VpnEWxQK8l>U~!RJ_Jh6e
zKEIG;Qb=4S!O+a$CJ?e#_`<IDo1Z`DatPvQXs}>VzIjWLLHjF%Hp8lL&dfXeSq}JY
z`zBD|;AYFf@Q1-;dDDO91(Ey;tQVHL6_m;-Gi)hhd^GF8<`@QsHw;V8vw1O;tQLrq
z<Y!>mAl|U<HS?0kObiSR7g9?F7#J8DLK$}J^7yhkL<w6kKge;o%6O(PpY?#p(Q5(>
zYiBty{9u@|@&*$FLm%UrXR{dvxD&R?F)%PZ5Ivw>52Di*?3rhBBq?>QOjy>$$iQ&v
z;F4xW1_rM~8l21w3>w_`*XYb?Rh+HQlb9*teK<nq)T4lD?VD}p@G9L<Xwpr(q15KP
z=!QyH?xP!OeZ5LIH72c1x~Vno?4p}Gv)(?soiBdAQE;}r#KDP%GLnZE2Fges-B>6i
zef;1=8JUyy7dOhto_=^yM(*s#kI}O7>*w;kn)PWdgMzEsg`$T~^tfHNGcGVR43cbM
zT{ej!Y?+(3(}q80n!FC$>F@3u?e#mvSfOx2=m!T!H1i3m3V#k&h6sffLN(c-M9RxB
zi(?h5y^y08LzDnRfXo4|mQ@G)ohC>f@R%KWOJ`@@*2w$y|6j=ac{AK>mhXI^%fWDi
z=Kx2`CWcik_S#L-EX54h`Cl<PJig__pt5o2nvjEGy!%S+r-DK}n_F=gOMN(t_}Z-n
zf!d{M-BFvrrf(JDWsqj9U}I#M%{ak<!NHlqn1g|#;TD5Q^D@~#9t?{)7%oU0;AjzJ
zP&v5!ef85@Tny%Yby|762}?^E3UYH9DwIy_(3~p5$iQ%cy@9=H&FxE`f`6DNo!Ks#
USvJ>#fq{X+)78&qol`;+0E!dxTL1t6

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 60d7909818..d071e7dab9 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2055,6 +2055,7 @@ public class Blocks implements ContentList{
 
         //TODO remove
         launchPadLarge = new LaunchPad("launch-pad-large"){{
+            requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75));
             size = 4;
             itemCapacity = 300;
             launchTime = 60f * 35;

From d84a36b8ee353e427bb63a3833a57fddcf7943a0 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 28 Dec 2020 16:44:59 +0100
Subject: [PATCH 4/5] Block loader/unloader progress bar changes (#4138)

* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down
---
 .../src/mindustry/world/blocks/experimental/BlockLoader.java | 3 ++-
 .../mindustry/world/blocks/experimental/BlockUnloader.java   | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
index fcac9ae455..34c210af04 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
@@ -1,5 +1,6 @@
 package mindustry.world.blocks.experimental;
 
+import arc.*;
 import arc.graphics.g2d.*;
 import arc.util.*;
 import mindustry.entities.units.*;
@@ -46,7 +47,7 @@ public class BlockLoader extends PayloadAcceptor{
     public void setBars(){
         super.setBars();
 
-        bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, ((BlockLoaderBuild)entity)::fraction));
+        bars.add("progress", (BlockLoaderBuild entity) -> new Bar(() -> Core.bundle.format("bar.items", entity.payload == null ? 0 : entity.payload.build.items.total()), () -> Pal.items, entity::fraction));
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
index 12b5e856dd..cdb3681ae9 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java
@@ -54,11 +54,6 @@ public class BlockUnloader extends BlockLoader{
             return items.total() >= itemCapacity;
         }
 
-        @Override
-        public float fraction(){
-            return payload == null ? 0f : 1f - payload.build.items.total() / (float)payload.build.block.itemCapacity;
-        }
-
         @Override
         public boolean shouldExport(){
             return payload != null && (payload.block().hasItems && payload.build.items.empty());

From 0e1e3997881f21c1218b0be56e747299e0988fe7 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Mon, 28 Dec 2020 18:23:06 +0100
Subject: [PATCH 5/5] Draw reconstructor in region during placement &
 unconnected (#4143)

* Draw reconstructor in region during placement & unconnected

* Same as the previous commit, but for block loaders & unloaders
---
 core/src/mindustry/world/blocks/experimental/BlockLoader.java | 4 ++++
 core/src/mindustry/world/blocks/units/Reconstructor.java      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
index 34c210af04..172ea8e5b7 100644
--- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java
+++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java
@@ -53,6 +53,7 @@ public class BlockLoader extends PayloadAcceptor{
     @Override
     public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
         Draw.rect(region, req.drawx(), req.drawy());
+        Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90);
         Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
         Draw.rect(topRegion, req.drawx(), req.drawy());
     }
@@ -77,11 +78,14 @@ public class BlockLoader extends PayloadAcceptor{
             Draw.rect(region, x, y);
 
             //draw input
+            boolean fallback = true;
             for(int i = 0; i < 4; i++){
                 if(blends(i) && i != rotation){
                     Draw.rect(inRegion, x, y, (i * 90) - 180);
+                    fallback = false;
                 }
             }
+            if(fallback) Draw.rect(inRegion, x, y, rotation * 90);
 
             Draw.rect(outRegion, x, y, rotdeg());
 
diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java
index 634ea5b911..3f65908068 100644
--- a/core/src/mindustry/world/blocks/units/Reconstructor.java
+++ b/core/src/mindustry/world/blocks/units/Reconstructor.java
@@ -33,6 +33,7 @@ public class Reconstructor extends UnitBlock{
     @Override
     public void drawRequestRegion(BuildPlan req, Eachable<BuildPlan> list){
         Draw.rect(region, req.drawx(), req.drawy());
+        Draw.rect(inRegion, req.drawx(), req.drawy(), req.rotation * 90);
         Draw.rect(outRegion, req.drawx(), req.drawy(), req.rotation * 90);
         Draw.rect(topRegion, req.drawx(), req.drawy());
     }
@@ -127,11 +128,14 @@ public class Reconstructor extends UnitBlock{
             Draw.rect(region, x, y);
 
             //draw input
+            boolean fallback = true;
             for(int i = 0; i < 4; i++){
                 if(blends(i) && i != rotation){
                     Draw.rect(inRegion, x, y, (i * 90) - 180);
+                    fallback = false;
                 }
             }
+            if(fallback) Draw.rect(inRegion, x, y, rotation * 90);
 
             Draw.rect(outRegion, x, y, rotdeg());