aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-02-14 00:35:13 +0900
committerGitHub <noreply@github.com>2023-02-13 16:35:13 +0100
commitc4e0faabbc0eaf4fb571a6f32558a5e9d80d3afc (patch)
tree7bd45fdeda87100a77f5dbb3296bd62dcdc5f499 /src/main/java/gregtech/common
parent47a58d03cdbfbb9b072d5f0703b4a702baede591 (diff)
downloadGT5-Unofficial-c4e0faabbc0eaf4fb571a6f32558a5e9d80d3afc.tar.gz
GT5-Unofficial-c4e0faabbc0eaf4fb571a6f32558a5e9d80d3afc.tar.bz2
GT5-Unofficial-c4e0faabbc0eaf4fb571a6f32558a5e9d80d3afc.zip
Fix id conflict with Living Crystal Chip (#1735)
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index a88a0a2b89..baafc4c876 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -3544,7 +3544,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
ItemList.Circuit_Parts_Crystal_Chip_Master
.set(addItem(tLastID = 714, "Engraved Lapotron Chip", "Needed for Circuits"));
ItemList.Circuit_Parts_Crystal_Chip_Wetware
- .set(addItem(tLastID = 550, "Living Crystal Chip", "Needed for Circuits"));
+ .set(addItem(tLastID = 668, "Living Crystal Chip", "Needed for Circuits"));
ItemList.Circuit_Parts_Advanced.set(addItem(tLastID = 715, "Diode", "Basic Electronic Component"));
ItemList.Circuit_Parts_Diode.set(ItemList.Circuit_Parts_Advanced.get(1));
ItemList.Circuit_Parts_Wiring_Basic.set(addItem(tLastID = 716, "Resistor", "Basic Electronic Component"));