Merge branch 'mc1.17/dev' into mc1.18/dev

This commit is contained in:
simibubi 2021-12-09 06:13:15 +01:00
commit 1590acd1ab

View File

@ -671,7 +671,7 @@ public class AllTileEntities {
.register(); .register();
public static final BlockEntityEntry<PulseExtenderTileEntity> PULSE_EXTENDER = Create.registrate() public static final BlockEntityEntry<PulseExtenderTileEntity> PULSE_EXTENDER = Create.registrate()
.tileEntity("adjustable_repeater", PulseExtenderTileEntity::new) .tileEntity("pulse_extender", PulseExtenderTileEntity::new)
.instance(() -> BrassDiodeInstance::new) .instance(() -> BrassDiodeInstance::new)
.validBlocks(AllBlocks.PULSE_EXTENDER) .validBlocks(AllBlocks.PULSE_EXTENDER)
.renderer(() -> BrassDiodeRenderer::new) .renderer(() -> BrassDiodeRenderer::new)
@ -679,7 +679,7 @@ public class AllTileEntities {
public static final BlockEntityEntry<PulseRepeaterTileEntity> PULSE_REPEATER = public static final BlockEntityEntry<PulseRepeaterTileEntity> PULSE_REPEATER =
Create.registrate() Create.registrate()
.tileEntity("adjustable_pulse_repeater", PulseRepeaterTileEntity::new) .tileEntity("pulse_repeater", PulseRepeaterTileEntity::new)
.instance(() -> BrassDiodeInstance::new) .instance(() -> BrassDiodeInstance::new)
.validBlocks(AllBlocks.PULSE_REPEATER) .validBlocks(AllBlocks.PULSE_REPEATER)
.renderer(() -> BrassDiodeRenderer::new) .renderer(() -> BrassDiodeRenderer::new)