Skip to content

Commit

Permalink
Change Canola back to Rape seed (GTNewHorizons#2464)
Browse files Browse the repository at this point in the history
* Revert "Canola is a better name than Rapeseed (id is staying the same) (GTNewHorizons#2443)"

This reverts commit 2e7625f.

* Only rename visual item name, not internal name

* Revert "Only rename visual item name, not internal name"

This reverts commit d1a7643.
  • Loading branch information
Caedis authored Jan 15, 2024
1 parent 9fd1d36 commit f2ac9f9
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 8 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/enums/ItemList.java
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2212,10 +2212,10 @@ public GT_MetaGenerated_Item_02() {
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),
Expand Down Expand Up @@ -2615,7 +2615,7 @@ public GT_MetaGenerated_Item_02() {
.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)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/loaders/postload/GT_CropLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ public void run() {
null);
new GT_BaseCrop(
178,
"Canola",
"Rape",
"unknown",
null,
4,
Expand All @@ -1026,7 +1026,7 @@ public void run() {
2,
0,
new String[] { "Food", "Yellow", "Oil" },
ItemList.Crop_Drop_Canola.get(1),
ItemList.Crop_Drop_Rape.get(1),
null);
new GT_BaseCrop(
179,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ public void run() {
.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)
Expand Down

0 comments on commit f2ac9f9

Please sign in to comment.