Update Forge

mezz · Jun 26, 2016 · 56029e6 · 56029e6
1 parent 7a8ae41
commit 56029e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 mcversion=1.10
-forgeversion=12.18.0.1981-1.10.0
+forgeversion=12.18.0.1999-1.10.0
 mcp_mappings=snapshot_20160518
 curse_project_id=238222
 

diff --git a/src/main/java/mezz/jei/JustEnoughItems.java b/src/main/java/mezz/jei/JustEnoughItems.java
@@ -22,8 +22,8 @@
 		name = Constants.NAME,
 		version = Constants.VERSION,
 		guiFactory = "mezz.jei.config.JEIModGuiFactory",
-		acceptedMinecraftVersions = "[1.9,1.10]",
-		dependencies = "required-after:Forge@[12.17.0.1946,);")
+		acceptedMinecraftVersions = "[1.10]",
+		dependencies = "required-after:Forge@[12.18.0.1999,);")
 public class JustEnoughItems {
 
 	@SidedProxy(clientSide = "mezz.jei.ProxyCommonClient", serverSide = "mezz.jei.ProxyCommon")

diff --git a/src/main/java/mezz/jei/gui/MasterFocus.java b/src/main/java/mezz/jei/gui/MasterFocus.java
@@ -71,11 +71,6 @@ private static FluidStack getFluidFromItemStack(@Nonnull ItemStack stack) {
 			}
 		}
 
-		// workaround for broken FluidContainerRegistry entry for potions
-		if (item instanceof ItemPotion) {
-			return null;
-		}
-
 		FluidStack fluidContained = FluidUtil.getFluidContained(stack);
 		if (fluidContained != null) {
 			return fluidContained;