From f2ac9f9aa85d366bb5595d0ec403dab3d98a2439 Mon Sep 17 00:00:00 2001 From: Caedis Date: Mon, 15 Jan 2024 09:25:10 -0600 Subject: Change Canola back to Rape seed (#2464) * Revert "Canola is a better name than Rapeseed (id is staying the same) (#2443)" This reverts commit 2e7625ffed587d930afda7692db0c478e430a8c2. * Only rename visual item name, not internal name * Revert "Only rename visual item name, not internal name" This reverts commit d1a764338344c4871fd12cb4890c38bb1f9ca40b. --- misc/vector/crop_drop.canola.svg | 933 --------------------- misc/vector/crop_drop.rape.svg | 933 +++++++++++++++++++++ src/main/java/gregtech/api/enums/ItemList.java | 2 +- .../common/items/GT_MetaGenerated_Item_02.java | 6 +- .../gregtech/loaders/postload/GT_CropLoader.java | 4 +- .../postload/recipes/FluidExtractorRecipes.java | 2 +- .../textures/blocks/crop/blockCrop.Canola.1.png | Bin 3082 -> 0 bytes .../textures/blocks/crop/blockCrop.Canola.2.png | Bin 3066 -> 0 bytes .../textures/blocks/crop/blockCrop.Canola.3.png | Bin 3176 -> 0 bytes .../textures/blocks/crop/blockCrop.Canola.4.png | Bin 682 -> 0 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.1.png | Bin 0 -> 3082 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.2.png | Bin 0 -> 3066 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.3.png | Bin 0 -> 3176 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.4.png | Bin 0 -> 682 bytes 14 files changed, 940 insertions(+), 940 deletions(-) delete mode 100644 misc/vector/crop_drop.canola.svg create mode 100644 misc/vector/crop_drop.rape.svg delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.1.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.2.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.3.png delete mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.4.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png diff --git a/misc/vector/crop_drop.canola.svg b/misc/vector/crop_drop.canola.svg deleted file mode 100644 index a573c3544d..0000000000 --- a/misc/vector/crop_drop.canola.svg +++ /dev/null @@ -1,933 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/vector/crop_drop.rape.svg b/misc/vector/crop_drop.rape.svg new file mode 100644 index 0000000000..35db917110 --- /dev/null +++ b/misc/vector/crop_drop.rape.svg @@ -0,0 +1,933 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +