aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common/items
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-01-25 04:43:40 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-01-25 04:43:40 +0000
commitf25534d89a96449f6d7a1adda952c35d234672f5 (patch)
treead0dff32f74ce7e0f54233291963abc6db8c68c3 /src/Java/gtPlusPlus/xmod/gregtech/common/items
parentb41d734f18e0ec5a6d38fda93be8143fdcaf4c24 (diff)
parentc7c62d38eec9034c09a09dbdec02dcb492ec55e7 (diff)
downloadGT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.tar.gz
GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.tar.bz2
GT5-Unofficial-f25534d89a96449f6d7a1adda952c35d234672f5.zip
Merge branch 'master' into imgbot
# Conflicts: # src/resources/assets/miscutils/textures/items/itemBufferCore.png
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/items')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index b54eb770ec..7f426f8abb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -292,6 +292,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
GregtechItemList.NanoTube_Finished.set(this.addItem(102, "Carbon Nanotubes", "Multi-walled Zigzag nanotubes, possibly Carbon's final form", new Object[0]));
GregtechItemList.Carbyne_Tube_Finished.set(this.addItem(103, "Linear Acetylenic Carbon (LAC/Carbyne)", "LAC chains grown inside Multi-walled Carbon Nanotubes, highly stable", new Object[0]));
GregtechItemList.Carbyne_Sheet_Finished.set(this.addItem(104, "Carbyne Composite Panel", "Nanotubes which contain LAC, arranged side by side and compressed further", new Object[0]));
+ GregtechItemList.Laser_Lens_Special.set(this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers", new Object[0]));
}