diff --git a/core/assets/baseparts/753232120369119314.msch b/core/assets/baseparts/753232120369119314.msch
deleted file mode 100644
index f68d33fae5..0000000000
Binary files a/core/assets/baseparts/753232120369119314.msch and /dev/null differ
diff --git a/core/assets/baseparts/772833439719489546.msch b/core/assets/baseparts/772833439719489546.msch
deleted file mode 100644
index 8a5af23761..0000000000
Binary files a/core/assets/baseparts/772833439719489546.msch and /dev/null differ
diff --git a/core/assets/baseparts/772833740053020682.msch b/core/assets/baseparts/772833740053020682.msch
deleted file mode 100644
index eb1fb26d3b..0000000000
Binary files a/core/assets/baseparts/772833740053020682.msch and /dev/null differ
diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java
index cc572fdfd3..42f261edce 100644
--- a/core/src/mindustry/core/NetClient.java
+++ b/core/src/mindustry/core/NetClient.java
@@ -322,15 +322,15 @@ public class NetClient implements ApplicationListener{
     }
 
     @Remote(variants = Variant.both, unreliable = true)
-    public static void onEffect(Effect effect, float x, float y, float rotation, Color color){
+    public static void effect(Effect effect, float x, float y, float rotation, Color color){
         if(effect == null) return;
 
         effect.at(x, y, rotation, color);
     }
 
     @Remote(variants = Variant.both)
-    public static void onEffectReliable(Effect effect, float x, float y, float rotation, Color color){
-        onEffect(effect, x, y, rotation, color);
+    public static void effectReliable(Effect effect, float x, float y, float rotation, Color color){
+        effect(effect, x, y, rotation, color);
     }
 
     @Remote(variants = Variant.both)
diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java
index 166063f828..ce37e80dde 100644
--- a/core/src/mindustry/world/blocks/ConstructBlock.java
+++ b/core/src/mindustry/world/blocks/ConstructBlock.java
@@ -273,7 +273,7 @@ public class ConstructBlock extends Block{
                     int accumulated = (int)(accumulator[i]); //get amount
 
                     if(clampedAmount > 0 && accumulated > 0){ //if it's positive, add it to the core
-                        if(core != null){
+                        if(core != null && requirements[i].item.unlockedNow()){ //only accept items that are unlocked
                             int accepting = core.acceptStack(requirements[i].item, accumulated, builder);
                             core.handleStack(requirements[i].item, accepting, builder);
                             accumulator[i] -= accepting;
diff --git a/gradle.properties b/gradle.properties
index 075558d561..c40626f1f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=c3f584d2d17fe0a91798565b73ea4d72ad312abf
+archash=de1a34fbd27468986a0540d0b51146291d9f2db4