diff --git a/build.gradle b/build.gradle
index a48b5f82a..e79fa7a67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,16 @@
-plugins {
-	id "net.minecraftforge.gradle.forge" version "2.0.2"
+buildscript {
+	repositories {
+		jcenter()
+		maven {
+			name = "forge"
+			url = "http://files.minecraftforge.net/maven"
+		}
+	}
+	dependencies {
+		classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+	}
 }
+apply plugin: 'net.minecraftforge.gradle.forge'
 
 version = version_major + '.' + version_minor + '.' + version_patch
 group= "mezz.jei" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -13,7 +23,7 @@ targetCompatibility = 1.8
 minecraft {
 	version = mcversion + "-" + forgeversion
 	runDir = "run"
-	mappings = "snapshot_nodoc_20151110"
+	mappings = "snapshot_20151122"
 }
 
 repositories {
diff --git a/gradle.properties b/gradle.properties
index 3f16b7aa2..8cef3e6ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
-mcversion=1.8
-forgeversion=11.14.4.1563
+mcversion=1.8.8
+forgeversion=11.14.4.1576-1.8.8
 
-version_major=1
+version_major=2
 version_minor=0
-version_patch=1
+version_patch=0
diff --git a/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeMaker.java b/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeMaker.java
index d71942798..e4f6ec497 100644
--- a/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeMaker.java
+++ b/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeMaker.java
@@ -3,11 +3,11 @@
 import java.util.List;
 
 import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
 
 public class CraftingRecipeMaker {
 
-	@SuppressWarnings("unchecked")
-	public static List<Object> getCraftingRecipes() {
+	public static List<IRecipe> getCraftingRecipes() {
 		return CraftingManager.getInstance().getRecipeList();
 	}
 
diff --git a/src/main/java/mezz/jei/util/Commands.java b/src/main/java/mezz/jei/util/Commands.java
index f0c51cbe2..880e94f61 100644
--- a/src/main/java/mezz/jei/util/Commands.java
+++ b/src/main/java/mezz/jei/util/Commands.java
@@ -33,7 +33,7 @@ public static void giveStack(@Nonnull ItemStack itemStack, int amount) {
 		List<String> commandStrings = new ArrayList<>();
 		commandStrings.add("/give");
 		commandStrings.add(senderName);
-		commandStrings.add((String) Item.itemRegistry.getNameForObject(itemStack.getItem()));
+		commandStrings.add(Item.itemRegistry.getNameForObject(itemStack.getItem()).toString());
 		commandStrings.add(String.valueOf(amount));
 		commandStrings.add(String.valueOf(itemStack.getItemDamage()));
 
diff --git a/src/main/java/mezz/jei/util/MouseHelper.java b/src/main/java/mezz/jei/util/MouseHelper.java
index f803228dd..917505b74 100644
--- a/src/main/java/mezz/jei/util/MouseHelper.java
+++ b/src/main/java/mezz/jei/util/MouseHelper.java
@@ -15,7 +15,7 @@ public MouseHelper() {
 		Minecraft minecraft = Minecraft.getMinecraft();
 		displayWidth = minecraft.displayWidth;
 		displayHeight = minecraft.displayHeight;
-		scaledresolution = new ScaledResolution(minecraft, displayWidth, displayHeight);
+		scaledresolution = new ScaledResolution(minecraft);
 	}
 
 	public int getX() {