diff options
-rw-r--r-- | misc/vector/crop_drop.rape.svg (renamed from misc/vector/crop_drop.canola.svg) | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_CropLoader.java | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java | 2 | ||||
-rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png (renamed from src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.1.png) | bin | 3082 -> 3082 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png (renamed from src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.2.png) | bin | 3066 -> 3066 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png (renamed from src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.3.png) | bin | 3176 -> 3176 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png (renamed from src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.4.png) | bin | 682 -> 682 bytes |
9 files changed, 8 insertions, 8 deletions
diff --git a/misc/vector/crop_drop.canola.svg b/misc/vector/crop_drop.rape.svg index a573c3544d..35db917110 100644 --- a/misc/vector/crop_drop.canola.svg +++ b/misc/vector/crop_drop.rape.svg @@ -15,7 +15,7 @@ id="svg2" version="1.1" inkscape:version="0.48.5 r10040" - sodipodi:docname="crop_drop.canola.svg" + sodipodi:docname="crop_drop.rape.svg" inkscape:export-filename="C:\Users\Johannes\git\GT5-Unofficial\misc\vector\crop_drop.rape.png" inkscape:export-xdpi="4.5" inkscape:export-ydpi="4.5"> diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 34aac65743..ac1aeeb7b2 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -378,7 +378,7 @@ public enum ItemList implements IItemContainer { Crop_Drop_Grapes, Crop_Drop_TeaLeaf, Crop_Drop_Cucumber, - Crop_Drop_Canola, + Crop_Drop_Rape, Schematic, Schematic_Crafting, Schematic_1by1, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 9edb6b912a..1c4556b5a3 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2212,10 +2212,10 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); - ItemList.Crop_Drop_Canola.set( + ItemList.Crop_Drop_Rape.set( addItem( tLastID = 557, - "Canola", + "Rape", "Time to oil up!", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), @@ -2615,7 +2615,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { .addTo(compressorRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Canola.get(4L)) + .itemInputs(ItemList.Crop_Drop_Rape.get(4L)) .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) .duration(15 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java index 24ae49363a..e6608a52b6 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java @@ -1012,7 +1012,7 @@ public class GT_CropLoader implements Runnable { null); new GT_BaseCrop( 178, - "Canola", + "Rape", "unknown", null, 4, @@ -1026,7 +1026,7 @@ public class GT_CropLoader implements Runnable { 2, 0, new String[] { "Food", "Yellow", "Oil" }, - ItemList.Crop_Drop_Canola.get(1), + ItemList.Crop_Drop_Rape.get(1), null); new GT_BaseCrop( 179, diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 54d81b3b8b..11861a9618 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -503,7 +503,7 @@ public class FluidExtractorRecipes implements Runnable { .addTo(fluidExtractionRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Crop_Drop_Canola.get(1)) + .itemInputs(ItemList.Crop_Drop_Rape.get(1)) .fluidOutputs(Materials.SeedOil.getFluid(125)) .duration(1 * SECONDS + 12 * TICKS) .eut(2) diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png Binary files differindex 42d42935fd..42d42935fd 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png Binary files differindex e6315f5055..e6315f5055 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png Binary files differindex aed5d46ae3..aed5d46ae3 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png Binary files differindex f470e73038..f470e73038 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Canola.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png |