diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes
index 227492680..280544da9 100644
--- a/src/main/resources/assets/opencomputers/recipes/default.recipes
+++ b/src/main/resources/assets/opencomputers/recipes/default.recipes
@@ -183,7 +183,7 @@ redstoneCard1 {
           ["", "oc:materialCard", ""]]
 }
 redstoneCard2 {
-  input: [[blockRedstone, "oc:circuitChip2", enderPearl]
+  input: [[blockRedstone, "oc:circuitChip2", materialEnderPearl]
           ["", "oc:materialCard", ""]]
 }
 lanCard {
@@ -191,7 +191,7 @@ lanCard {
           ["", "oc:materialCard", ""]]
 }
 wlanCard {
-  input: [[enderPearl, "oc:circuitChip2", ""]
+  input: [[materialEnderPearl, "oc:circuitChip2", ""]
           ["", "oc:materialCard", ""]]
 }
 linkedCard {
@@ -211,9 +211,9 @@ worldSensorCard {
 }
 
 angelUpgrade {
-  input: [[ingotIron, enderPearl, ingotIron]
+  input: [[ingotIron, materialEnderPearl, ingotIron]
           ["oc:circuitChip1", pistonStickyBase, "oc:circuitChip1"]
-          [ingotIron, enderPearl, ingotIron]]
+          [ingotIron, materialEnderPearl, ingotIron]]
 }
 batteryUpgrade1 {
   input: [[ingotIron, nuggetGold, ingotIron]
@@ -231,7 +231,7 @@ batteryUpgrade3 {
           [diamond, "oc:capacitor", diamond]]
 }
 chunkloaderUpgrade {
-  input: [[ingotGold, glass, ingotGold]
+  input: [[ingotGold, blockGlass, ingotGold]
           ["oc:circuitChip3", eyeOfEnder, "oc:circuitChip3"]
           [obsidian, "oc:materialCircuitBoardPrinted", obsidian]]
 }
@@ -306,7 +306,7 @@ signUpgrade {
           [ingotIron, pistonStickyBase, ingotIron]]
 }
 solarGeneratorUpgrade {
-  input: [[glass, glass, glass]
+  input: [[blockGlass, blockGlass, blockGlass]
           ["oc:circuitChip3", blockLapis, "oc:circuitChip3"]
           [ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
 }
@@ -391,9 +391,9 @@ chameliumBlock {
           ["oc:chamelium", "oc:chamelium", "oc:chamelium"]]
 }
 endstone {
-  input: [[enderPearl, "oc:chameliumBlock", enderPearl]
-          ["oc:chameliumBlock", enderPearl, "oc:chameliumBlock"]
-          [enderPearl, "oc:chameliumBlock", enderPearl]]
+  input: [[materialEnderPearl, "oc:chameliumBlock", materialEnderPearl]
+          ["oc:chameliumBlock", materialEnderPearl, "oc:chameliumBlock"]
+          [materialEnderPearl, "oc:chameliumBlock", materialEnderPearl]]
   output: 4
 }
 inkCartridgeEmpty {
@@ -508,7 +508,7 @@ card {
 
 interweb {
   input: [[string, string, string]
-          [string, enderPearl, string]
+          [string, materialEnderPearl, string]
           [string, string, string]]
 }
 
@@ -554,7 +554,7 @@ case3 {
           [diamond, "oc:materialCircuitBoardPrinted", diamond]]
 }
 disassembler {
-  input: [["oc:materialCU", thinGlass, "oc:analyzer"]
+  input: [["oc:materialCU", paneGlass, "oc:analyzer"]
           [craftingPiston, "", obsidian]
           [ingotIron, bucketLava, ingotIron]]
 }
@@ -569,12 +569,12 @@ geolyzer {
           [ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]]
 }
 hologram1 {
-  input: [["oc:circuitChip2", thinGlass, "oc:circuitChip2"]
+  input: [["oc:circuitChip2", paneGlass, "oc:circuitChip2"]
           ["oc:materialCircuitBoardPrinted", diamond, "oc:materialCircuitBoardPrinted"]
           [obsidian, yellowDust, obsidian]]
 }
 hologram2 {
-  input: [["oc:circuitChip3", glass, "oc:circuitChip3"]
+  input: [["oc:circuitChip3", blockGlass, "oc:circuitChip3"]
           ["oc:materialCircuitBoardPrinted", blockDiamond, "oc:materialCircuitBoardPrinted"]
           [obsidian, blazePowder, obsidian]]
 }
@@ -629,17 +629,17 @@ relay {
 }
 screen1 {
   input: [[ingotIron, redstone, ingotIron]
-          [redstone, "oc:circuitChip1", glass]
+          [redstone, "oc:circuitChip1", blockGlass]
           [ingotIron, redstone, ingotIron]]
 }
 screen2 {
   input: [[ingotGold, dyeRed, ingotGold]
-          [dyeGreen, "oc:circuitChip2", glass]
+          [dyeGreen, "oc:circuitChip2", blockGlass]
           [ingotGold, dyeBlue, ingotGold]]
 }
 screen3 {
   input: [[obsidian, yellowDust, obsidian]
-          [yellowDust, "oc:circuitChip3", glass]
+          [yellowDust, "oc:circuitChip3", blockGlass]
           [obsidian, yellowDust, obsidian]]
 }
 transposer {
diff --git a/src/main/resources/assets/opencomputers/recipes/gregtech.recipes b/src/main/resources/assets/opencomputers/recipes/gregtech.recipes
index f2b3768c7..566da31d6 100644
--- a/src/main/resources/assets/opencomputers/recipes/gregtech.recipes
+++ b/src/main/resources/assets/opencomputers/recipes/gregtech.recipes
@@ -126,7 +126,7 @@ lanCard {
 }
 wlanCard {
   input: [[screwTitanium , "oc:circuitChip3" , screwTitanium]
-          [enderPearl, "oc:lanCard", enderPearl]
+          [materialEnderPearl, "oc:lanCard", materialEnderPearl]
           [screwTitanium , craftingToolScrewdriver, screwTitanium]]
 }
 
@@ -333,7 +333,7 @@ relay {
 }
 screen1 {
   input: [[plateAluminium, plateAluminium, craftingToolWrench]
-          [redstone, "oc:materialTransistor", thinGlass]
+          [redstone, "oc:materialTransistor", paneGlass]
           [plateAluminium, plateAluminium, craftingToolScrewdriver]]
 }
 screen2 {
diff --git a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes
index 2618e9179..3a1cd0c1c 100644
--- a/src/main/resources/assets/opencomputers/recipes/hardmode.recipes
+++ b/src/main/resources/assets/opencomputers/recipes/hardmode.recipes
@@ -109,7 +109,7 @@ redstoneCard1 {
           ["", "oc:materialCard", ""]]
 }
 redstoneCard2 {
-  input: [[blockRedstone, "oc:circuitChip2", enderPearl]
+  input: [[blockRedstone, "oc:circuitChip2", materialEnderPearl]
           ["", "oc:redstoneCard1", ""]]
 }
 lanCard {
@@ -117,7 +117,7 @@ lanCard {
           ["", "oc:materialCard", ""]]
 }
 wlanCard {
-  input: [[enderPearl, "oc:circuitChip2", ""]
+  input: [[materialEnderPearl, "oc:circuitChip2", ""]
           ["", "oc:lanCard", ""]]
 }
 linkedCard {
@@ -178,7 +178,7 @@ signUpgrade {
           [ingotIron, pistonStickyBase, ingotIron]]
 }
 solarGeneratorUpgrade {
-  input: [[glass, glass, glass]
+  input: [[blockGlass, blockGlass, blockGlass]
           ["oc:circuitChip3", "oc:generatorUpgrade", "oc:circuitChip3"]]
 }
 
@@ -291,9 +291,9 @@ card {
 }
 
 interweb {
-  input: [[string, enderPearl, string]
-          [enderPearl, string, enderPearl]
-          [string, enderPearl, string]]
+  input: [[string, materialEnderPearl, string]
+          [materialEnderPearl, string, materialEnderPearl]
+          [string, materialEnderPearl, string]]
 }
 
 adapter {
@@ -372,9 +372,9 @@ relay {
           [ingotIron, "oc:materialCircuitBoardPrinted", ingotIron]]
 }
 screen1 {
-  input: [[ingotIron, ingotIron, glass]
-          [redstone, "oc:materialTransistor", glass]
-          [ingotIron, ingotIron, glass]]
+  input: [[ingotIron, ingotIron, blockGlass]
+          [redstone, "oc:materialTransistor", blockGlass]
+          [ingotIron, ingotIron, blockGlass]]
 }
 screen2 {
   input: [[ingotGold, dyeRed, ingotGold]
diff --git a/src/main/resources/assets/opencomputers/recipes/peaceful.recipes b/src/main/resources/assets/opencomputers/recipes/peaceful.recipes
index 5401e0fb3..e85af03e9 100644
--- a/src/main/resources/assets/opencomputers/recipes/peaceful.recipes
+++ b/src/main/resources/assets/opencomputers/recipes/peaceful.recipes
@@ -21,7 +21,7 @@ angelUpgrade {
           [ingotIron, diamond, ingotIron]]
 }
 chunkloaderUpgrade {
-  input: [[ingotGold, glass, ingotGold]
+  input: [[ingotGold, blockGlass, ingotGold]
           ["oc:circuitChip3", diamond, "oc:circuitChip3"]
           [obsidian, "oc:materialCircuitBoardPrinted", obsidian]]
 }
@@ -69,7 +69,7 @@ geolyzer {
           [ingotGold, "oc:materialCircuitBoardPrinted", ingotGold]]
 }
 hologram2 {
-  input: [["oc:circuitChip3", glass, "oc:circuitChip3"]
+  input: [["oc:circuitChip3", blockGlass, "oc:circuitChip3"]
           ["oc:materialCircuitBoardPrinted", blockDiamond, "oc:materialCircuitBoardPrinted"]
           [obsidian, yellowDust, obsidian]]
 }
diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala
index 5f71021a5..49668102a 100644
--- a/src/main/scala/li/cil/oc/common/Proxy.scala
+++ b/src/main/scala/li/cil/oc/common/Proxy.scala
@@ -38,6 +38,7 @@ class Proxy {
     OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.piston)
     OreDictionary.registerOre("craftingPiston", net.minecraft.init.Blocks.sticky_piston)
     OreDictionary.registerOre("torchRedstoneActive", net.minecraft.init.Blocks.redstone_torch)
+    OreDictionary.registerOre("materialEnderPearl", net.minecraft.init.Items.ender_pearl)
     OreDictionary.registerOre("nuggetGold", net.minecraft.init.Items.gold_nugget)
     OreDictionary.registerOre("chest", net.minecraft.init.Blocks.chest)
     OreDictionary.registerOre("chest", net.minecraft.init.Blocks.ender_chest)