fix merge

2026-04-18 19:51:01 +02:00
parent 15b6b2c5ad dc16cebc25
commit 5ddafd2d84
18 changed files with 198 additions and 7 deletions
--- a/src/main/kotlin/org/neoflock/neocomputers/block/Blocks.kt
+++ b/src/main/kotlin/org/neoflock/neocomputers/block/Blocks.kt
@@ -32,6 +32,7 @@ object Blocks {
    val SOLARGEN_BLOCK: RegistrySupplier<Block> = BaseBlock.register("solargen") { SolarGeneratorBlock() }
    val COMBUSTGEN_BLOCK: RegistrySupplier<Block> = BaseBlock.register("combustgen") { CombustionGeneratorBlock() }
    val CASE_BLOCK: RegistrySupplier<Block> = BaseBlock.register("case") { CaseBlock() }
+    val REDSTONEIO_BLOCK: RegistrySupplier<Block> = BaseBlock.register("redio") { RedstoneIOBlock() }

    fun registerBlockItems() {
        BLOCKS.forEach(Consumer { sup: RegistrySupplier<Block> ->