Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-01-23 10:33:10 -05:00
5 changed files with 6 additions and 1 deletions

View File

@@ -145,6 +145,8 @@ public class Block extends UnlockableContent{
public boolean conveyorPlacement;
/** Whether to swap the diagonal placement modes. */
public boolean swapDiagonalPlacement;
/** Build queue priority in schematics. */
public int schematicPriority = 0;
/**
* The color of this block when displayed on the minimap or map preview.
* Do not set manually! This is overridden when loading for most blocks.

View File

@@ -22,6 +22,7 @@ public class PowerDiode extends Block{
insulated = true;
group = BlockGroup.power;
noUpdateDisabled = true;
schematicPriority = 10;
}
@Override

View File

@@ -43,6 +43,7 @@ public class PowerNode extends PowerBlock{
outputsPower = false;
canOverdrive = false;
swapDiagonalPlacement = true;
schematicPriority = -10;
drawDisabled = false;
config(Integer.class, (entity, value) -> {