Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -10,6 +10,7 @@ import mindustry.gen.*;
|
|||||||
import mindustry.world.*;
|
import mindustry.world.*;
|
||||||
import mindustry.world.blocks.payloads.*;
|
import mindustry.world.blocks.payloads.*;
|
||||||
import mindustry.world.blocks.production.*;
|
import mindustry.world.blocks.production.*;
|
||||||
|
import mindustry.world.meta.*;
|
||||||
|
|
||||||
import static mindustry.Vars.*;
|
import static mindustry.Vars.*;
|
||||||
|
|
||||||
@@ -17,7 +18,7 @@ public class UnitBlock extends PayloadAcceptor{
|
|||||||
|
|
||||||
public UnitBlock(String name){
|
public UnitBlock(String name){
|
||||||
super(name);
|
super(name);
|
||||||
|
group = BlockGroup.units;
|
||||||
outputsPayload = true;
|
outputsPayload = true;
|
||||||
rotate = true;
|
rotate = true;
|
||||||
update = true;
|
update = true;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package mindustry.world.meta;
|
package mindustry.world.meta;
|
||||||
|
|
||||||
public enum BlockGroup{
|
public enum BlockGroup{
|
||||||
none, walls, turrets, transportation, power, liquids, drills, storage
|
none, walls, turrets, transportation, power, liquids, drills, storage, units
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user