diff options
| author | miozune <miozune@gmail.com> | 2023-02-14 00:35:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-13 16:35:13 +0100 |
| commit | c4e0faabbc0eaf4fb571a6f32558a5e9d80d3afc (patch) | |
| tree | 7bd45fdeda87100a77f5dbb3296bd62dcdc5f499 /src | |
| parent | 47a58d03cdbfbb9b072d5f0703b4a702baede591 (diff) | |
| download | GT5-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')
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 2 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png (renamed from src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png) | bin | 1538 -> 1538 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png.mcmeta) | 0 |
3 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")); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png Binary files differindex c6ec444d9b..c6ec444d9b 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png.mcmeta index 287c39f0bb..287c39f0bb 100644 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png.mcmeta |
