Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/Blocks.java

@@ -2083,11 +2083,15 @@ public class Blocks implements ContentList{
         payloadSource = new PayloadSource("payload-source"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
+            alwaysUnlocked = true;
+            group = BlockGroup.units;
         }};
 
         payloadVoid = new PayloadVoid("payload-void"){{
             requirements(Category.units, BuildVisibility.sandboxOnly, with());
             size = 5;
+            alwaysUnlocked = true;
+            group = BlockGroup.units;
         }};
 
         //TODO move

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -55,6 +55,7 @@ public class CoreBlock extends StorageBlock{
         envEnabled = Env.any;
         drawDisabled = false;
         replaceable = false;
+        rebuildable = false;
     }
 
     @Remote(called = Loc.server)