Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/blocks/units/UnitBlock.java

@@ -10,6 +10,7 @@ import mindustry.gen.*;
 import mindustry.world.*;
 import mindustry.world.blocks.payloads.*;
 import mindustry.world.blocks.production.*;
+import mindustry.world.meta.*;
 
 import static mindustry.Vars.*;
 
@@ -17,7 +18,7 @@ public class UnitBlock extends PayloadAcceptor{
 
     public UnitBlock(String name){
         super(name);
-
+        group = BlockGroup.units;
         outputsPayload = true;
         rotate = true;
         update = true;

core/src/mindustry/world/meta/BlockGroup.java

@@ -1,5 +1,5 @@
 package mindustry.world.meta;
 
 public enum BlockGroup{
-    none, walls, turrets, transportation, power, liquids, drills, storage
+    none, walls, turrets, transportation, power, liquids, drills, storage, units
 }