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/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 + 4 files changed, 1 insertion(+), 1 deletion(-) 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/main/resources/assets') 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