aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-06-04 20:34:07 +0200
committerTechnus <daniel112092@gmail.com>2017-06-04 20:34:07 +0200
commit8e4a2a85023a16351c9c9c42425cf71d996bcdfc (patch)
tree9ad9a3ea70e50c335a35c2638f82f62e6213e4b1 /src/main/java/gregtech/common/items
parent18bdfe4df9061ccfc4baadc5828a0d0af59811b7 (diff)
parentad355d326da5df0d539de827827ed43a9d99da11 (diff)
downloadGT5-Unofficial-8e4a2a85023a16351c9c9c42425cf71d996bcdfc.tar.gz
GT5-Unofficial-8e4a2a85023a16351c9c9c42425cf71d996bcdfc.tar.bz2
GT5-Unofficial-8e4a2a85023a16351c9c9c42425cf71d996bcdfc.zip
Merge branch 'mergeGTNH' into experimental
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
index 77ff3fbf79..371d6bdb2c 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
@@ -72,9 +72,9 @@ public class GT_MetaGenerated_Item_03
*
* quantum chips
*/
- ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Ingot", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Ingot2.set(addItem(tLastID = 31, "Glowstone doped Monocrystalline Silicon Ingot", "Raw Circuit", o));
- ItemList.Circuit_Silicon_Ingot3.set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Ingot", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Ingot2.set(addItem(tLastID = 31, "Glowstone doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+ ItemList.Circuit_Silicon_Ingot3.set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o));
ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o));
ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Glowstone doped Wafer", "Raw Circuit", o));