diff --git a/build.properties b/build.properties index c1df6249..bf517867 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.10.2 forge.version=12.18.1.2079 -gt.version=5.10.40 +gt.version=5.10.41 forestry.version=5.2.7.220 ic2.version=2.6.167-ex110 diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 074de09e..d76c1c5a 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -318,7 +318,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { ItemList.IC2_Resin.set(GT_ModHandler.getIC2Item(ItemName.misc_resource, MiscResourceType.resin, 1)); ItemList.IC2_Plantball.set(GT_ModHandler.getIC2Item(ItemName.crafting, CraftingItemType.plant_ball, 1)); ItemList.IC2_PlantballCompressed.set(GT_ModHandler.getIC2Item(ItemName.crafting, CraftingItemType.plant_ball, 1)); - ItemList.IC2_Crop_Seeds.set(GT_ModHandler.getIC2Item(ItemName.crop_res, CropResItemType.coffee_beans, 1)); + ItemList.IC2_Crop_Seeds.set(GT_ModHandler.getIC2Item(ItemName.crop_seed_bag, 1)); ItemList.IC2_Grin_Powder.set(GT_ModHandler.getIC2Item(ItemName.crop_res, CropResItemType.grin_powder, 1)); ItemList.IC2_Energium_Dust.set(GT_ModHandler.getIC2Item(ItemName.dust, DustResourceType.energium, 1)); ItemList.IC2_Scrap.set(GT_ModHandler.getIC2Item(ItemName.crafting, CraftingItemType.scrap, 1)); diff --git a/src/main/java/gregtech/jei/JEIGregtehRecipeCategory.java b/src/main/java/gregtech/jei/JEIGregtehRecipeCategory.java index ba9fe60c..9a5dd638 100644 --- a/src/main/java/gregtech/jei/JEIGregtehRecipeCategory.java +++ b/src/main/java/gregtech/jei/JEIGregtehRecipeCategory.java @@ -16,6 +16,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.config.GuiUtils; import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.List; public class JEIGregtehRecipeCategory implements IRecipeCategory { @@ -70,6 +72,11 @@ public class JEIGregtehRecipeCategory implements IRecipeCategory getTooltipStrings(int mouseX, int mouseY) { + return Collections.emptyList(); + } + public IDrawable getIcon() { return null; }