Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/Block.java

@@ -63,6 +63,8 @@ public class Block extends UnlockableContent implements Senseable{
     public boolean acceptsPayload = false;
     /** Visual flag use for blending of certain transportation blocks. */
     public boolean acceptsItems = false;
+    /** If true, this block won't be affected by the onlyDepositCore rule. */
+    public boolean alwaysAllowDeposit = false;
     /** If true, all item capacities of this block are separate instead of pooled as one number. */
     public boolean separateItemCapacity = false;
     /** maximum items this block can carry (usually, this is per-type of item) */

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

@@ -68,6 +68,7 @@ public class CoreBlock extends StorageBlock{
         solid = true;
         update = true;
         hasItems = true;
+        alwaysAllowDeposit = true;
         priority = TargetPriority.core;
         flags = EnumSet.of(BlockFlag.core);
         unitCapModifier = 10;

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

@@ -126,5 +126,10 @@ public class StorageBlock extends Block{
         public boolean canPickup(){
             return linkedCore == null;
         }
+
+        @Override
+        public boolean allowDeposit(){
+            return linkedCore != null || super.allowDeposit();
+        }
     }
 }