fix merge

src/main/resources/assets/neocomputers/blockstates/redio.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "neocomputers:block/redio"
+    }
+  }
+}

src/main/resources/assets/neocomputers/lang/en_us.json

@@ -1,5 +1,6 @@
 {
   "neocomputers.confirm": "Confirm",
   "neocomputers.cancel": "Cancel",
-  "block.neocomputers.combustgen": "Combustion Generator"
+  "block.neocomputers.combustgen": "Combustion Generator",
+  "block.neocomputers.redio": "Redstone I/O"
 }

src/main/resources/assets/neocomputers/models/block/redio.json

@@ -0,0 +1,12 @@
+{
+  "parent": "minecraft:block/cube",
+  "textures": {
+    "up": "neocomputers:block/redio_top",
+    "down": "neocomputers:block/redio_bottom",
+    "north": "neocomputers:block/redio_north",
+    "south": "neocomputers:block/redio_south",
+    "west": "neocomputers:block/redio_west",
+    "east": "neocomputers:block/redio_east",
+    "particle": "minecraft:block/redstone_block"
+  }
+}

src/main/resources/assets/neocomputers/models/item/redio.json

@@ -0,0 +1,3 @@
+{
+  "parent": "neocomputers:block/redio"
+}