diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..f940f01
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,6 @@
+/bin/
+/eclipse/
+/.settings/
+.project
+.classpath
+*.launch
diff --git a/build/build.gradle b/build/build.gradle
index 4db70a4..e042f6d 100644
--- a/build/build.gradle
+++ b/build/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
@@ -11,11 +12,12 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
     }
 }
 
-apply plugin: 'forge'
+apply plugin: "maven"
+apply plugin: 'net.minecraftforge.gradle.forge'
 
 group = "codechicken" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "CodeChickenLib"
@@ -36,7 +38,8 @@ println  config.minecraft_version + "-" + config.forge_version
 // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
 minecraft {
     version = config.minecraft_version + "-" + config.forge_version
-    mappings = "snapshot_nodoc_20150404"
+    mappings = "snapshot_nodoc_20150918"
+    runDir = 'eclipse'
 }
 
 sourceSets {
@@ -68,7 +71,7 @@ jar {
     manifest commonManifest
 }
 
-task sourceJar(type: Jar) {
+task sourcesJar(type: Jar) {
     from sourceSets.main.java
     classifier = 'src'
 }
@@ -81,7 +84,7 @@ task devJar(type: Jar) {
 
 // Tell the artifact system about our extra jars
 artifacts {
-	archives sourceJar, devJar
+	archives sourcesJar, devJar
 }
 
 // Configure an upload task. this is setup for uploading to files.minecraftforge.net. There are other examples around
diff --git a/build/build.properties b/build/build.properties
index ef2b932..f5b5ad7 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -1,3 +1,3 @@
 minecraft_version=1.8
-forge_version=11.14.1.1353
+forge_version=11.14.3.1514
 mod_version=1.1.2
diff --git a/build/gradle/wrapper/gradle-wrapper.jar b/build/gradle/wrapper/gradle-wrapper.jar
index 3c7abdf..30d399d 100644
Binary files a/build/gradle/wrapper/gradle-wrapper.jar and b/build/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/build/gradle/wrapper/gradle-wrapper.properties b/build/gradle/wrapper/gradle-wrapper.properties
index 244a668..9397848 100644
--- a/build/gradle/wrapper/gradle-wrapper.properties
+++ b/build/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 26 13:33:58 CDT 2014
+#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
diff --git a/src/codechicken/lib/data/MCDataIO.java b/src/codechicken/lib/data/MCDataIO.java
index 838feb0..6529deb 100644
--- a/src/codechicken/lib/data/MCDataIO.java
+++ b/src/codechicken/lib/data/MCDataIO.java
@@ -120,7 +120,7 @@ public static void writeFluidStack(MCDataOutput out, FluidStack fluid) {
         if (fluid == null) {
             out.writeShort(-1);
         } else {
-            out.writeShort(fluid.fluidID);
+            out.writeShort(fluid.getFluidID());
             out.writeVarInt(fluid.amount);
             out.writeNBTTagCompound(fluid.tag);
         }