From c4e0faabbc0eaf4fb571a6f32558a5e9d80d3afc Mon Sep 17 00:00:00 2001 From: miozune Date: Tue, 14 Feb 2023 00:35:13 +0900 Subject: Fix id conflict with Living Crystal Chip (#1735) --- .../gregtech/common/items/GT_MetaGenerated_Item_01.java | 2 +- .../gregtech/textures/items/gt.metaitem.01/550.png | Bin 1538 -> 0 bytes .../textures/items/gt.metaitem.01/550.png.mcmeta | 1 - .../gregtech/textures/items/gt.metaitem.01/668.png | Bin 0 -> 1538 bytes .../textures/items/gt.metaitem.01/668.png.mcmeta | 1 + 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png.mcmeta (limited to 'src') 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/550.png deleted file mode 100644 index c6ec444d9b..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png and /dev/null differ 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/550.png.mcmeta deleted file mode 100644 index 287c39f0bb..0000000000 --- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/550.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{"animation": {"frametime": 8}} diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png new file mode 100644 index 0000000000..c6ec444d9b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png.mcmeta b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png.mcmeta new file mode 100644 index 0000000000..287c39f0bb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/668.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 8}} -- cgit