diff --git a/build.gradle~ b/build.gradle~
new file mode 100644
index 00000000..8780dd5e
--- /dev/null
+++ b/build.gradle~
@@ -0,0 +1,135 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+        maven {
+            url 'https://oss.sonatype.org/content/groups/public'
+        }
+        mavenLocal()
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+repositories {
+    ivy {
+
+        name 'Forge FS legacy'
+        artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]"
+    }
+
+    maven {
+        name 'ForgeFS'
+        url 'http://files.minecraftforge.net/maven'
+    }
+    maven {
+        name 'MinecraftS3'
+        url 'http://s3.amazonaws.com/Minecraft.Download/libraries'
+    }
+    maven {
+        name 'DVS1 Maven FS'
+        url 'http://dvs1.progwml6.com/files/maven'
+    }
+    maven { // The repo from which to get waila
+        name "Mobius Repo"
+        url "http://mobiusstrip.eu/maven"
+    }
+    maven { // the repo from which to get NEI and stuff
+        name 'CB Repo'
+        url "http://chickenbones.net/maven/"
+    }
+}
+String changelogLoc = 'https://raw.github.com/Thaumic-Tinkerer/ThaumicTinkerer/changelog/web/changelog'
+
+//apply plugin: 'curseforge'
+apply plugin: 'forge'
+
+
+
+
+group = "thaumic.tinkerer" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "ThaumicTinkerer"
+
+minecraft {
+    version = "1.7.10-10.13.2.1230"
+    //minecraftVersion="1.7.2"
+    runDir = "eclipse"
+    replace '${version}', project.version
+    //coreMod("tconstruct.preloader.TConstructLoaderContainer")
+    if (project.hasProperty("pass"))
+        replace "INSERTPASSWORDHERE", project.pass
+
+
+}
+version = "2.5-${minecraft.version}"
+if (System.getenv("BUILD_NUMBER")!=null)
+    version = "$version-${System.getenv().BUILD_NUMBER}"
+if (project.hasProperty("releaseType"))
+    if (project.releaseType == "ALPHA")
+        version = "alpha-" + version
+//curse {
+//    projectId="75598"
+//    if(project.hasProperty("apiKey"))
+//        apiKey=project.apiKey
+//   changelog="test"
+//   if(project.hasProperty("releaseType"))
+//       releaseType=project.releaseType
+//}
+
+
+dependencies {
+    compile "codechicken:CodeChickenLib:1.7.10-1.1.1.104:dev"
+    compile "mcp.mobius.waila:Waila:1.5.3a_1.7.10"
+    compile "codechicken:ForgeMultipart:1.7.10-1.1.0.300:dev"
+    compile "codechicken:CodeChickenCore:1.7.10-1.0.3.25:dev"
+
+    compile "codechicken:NotEnoughItems:1.7.10-1.0.3.51:dev"
+    compile "codechicken:EnderStorage:1.7.10-1.4.5.22:dev"
+    compile "mantle:Mantle:1.7.10-0.3.1.jenkins167:deobf"
+    compile("tconstruct:TConstruct:1.7.10-1.6.0.build625:deobf") {
+    }
+}
+// some crazy stuff to make sure the chicken stuff is in the mods folder...
+// because it wont work otherwise...  because FML doesnt laod coremods from the classpath
+task copyChicken(type: Copy, dependsOn: "extractUserDev") {
+    from { configurations.compile }
+    include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
+    exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
+    into file(minecraft.runDir + "/mods")
+
+    mustRunAfter "deobfBinJar"
+    mustRunAfter "repackMinecraft"
+}
+tasks.setupDevWorkspace.dependsOn copyChicken
+tasks.setupDecompWorkspace.dependsOn copyChicken
+processResources
+        {
+            // replace stuff in mcmod.info, nothing else
+            from(sourceSets.main.resources.srcDirs) {
+                include 'mcmod.info'
+                // replace version and mcversion
+                expand 'version': project.version, 'MCversion': project.minecraft.version
+            }
+
+            // copy everything else, thats not the mcmod.info
+            from(sourceSets.main.resources.srcDirs) {
+                exclude 'mcmod.info'
+            }
+        }
+jar {
+    manifest {
+        attributes 'FMLCorePlugin': 'thaumic.tinkerer.preloader.ThaumicTLoaderContainer'
+        attributes 'FMLCorePluginContainsFMLMod': 'true'
+    }
+}
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+}
diff --git a/build.xml~ b/build.xml~
new file mode 100644
index 00000000..e37174db
--- /dev/null
+++ b/build.xml~
@@ -0,0 +1,305 @@
+<project name="ThaumicTinkerer" default="install" basedir=".">
+    <!-- Buildscript thanks to CoFH -->
+    <property environment="env"/>
+    <!-- Basic directories -->
+    <property name="src.dir" value="src/main/java"/>
+    <property name="api.dir" value="src/api/java"/>
+    <property name="library.dir" value="libs"/>
+    <property name="library.download.dir" value="${library.dir}/downloads"/>
+    <property name="resources.dir" value="src/main/resources"/>
+    <property name="build.dir" value="build"/>
+    <property name="download.dir" value="${build.dir}/downloads"/>
+    <!-- Project information -->
+    <property name="build.name" value="${ant.project.name}"/>
+    <property name="class.pckg" value="thaumic/tinkerer"/>
+    <!-- Version file -->
+    <property name="verclass.dir" value="${src.dir}/${class.pckg}/common/lib"/>
+    <property name="verclass.name" value="LibMisc.java"/>
+    <!-- Forge version -->
+    <property name="mc.version" value="1.7.10"/>
+    <property name="forge.major" value="10"/>
+    <property name="forge.minor" value="13"/>
+    <property name="forge.patch" value="0"/>
+    <property name="forge.build" value="1180"/>
+    <!-- Packaging -->
+    <property name="dist.dir" value="${build.dir}/dist"/>
+    <property name="classes.dir" value="${build.dir}/packaging"/>
+    <property name="apiclasses.dir" value="${build.dir}/api-packaging"/>
+    <!-- Forge paths -->
+    <property name="forge.version" value="${mc.version}-${forge.major}.${forge.minor}.${forge.patch}.${forge.build}"/>
+    <property name="forge.dir" value="${build.dir}/forge"/>
+    <property name="forgebuild.dir" value="${forge.dir}/build"/>
+    <property name="compile.dir" value="${forgebuild.dir}/tmp/compile"/>
+    <property name="lib.dir" value="${forgebuild.dir}/libs"/>
+    <property name="sources.dir" value="${forgebuild.dir}/sources/minecraft"/>
+    <property name="transformers.dir" value="${forge.dir}/src/main/resources/"/>
+    <property name="forge.stsh"
+              value="${build.dir}/.gradle/caches/minecraft/net/minecraftforge/forge/${forge.version}"/>
+    <property name="forge.jar" value="${forge.stsh}/forgeSrc-${forge.version}.jar"/>
+    <property name="reobf.cmd" value="${download.dir}/bon.jar"/>
+    <property name="forge.url"
+              value="http://files.minecraftforge.net/maven/net/minecraftforge/forge/${forge.version}/forge-${forge.version}-src.zip"/>
+    <!-- Classpaths -->
+    <path id="lib.classpath">
+        <pathelement location="${forge.jar}"/>
+        <fileset dir="${lib.dir}">
+            <include name="*.jar"/>
+            <include name="**/*.jar"/>
+            <exclude name="${reobf.jar}"/>
+        </fileset>
+        <fileset dir="libs">
+            <include name="*.jar"/>
+            <include name="**/*.jar"/>
+        </fileset>
+        <!--fileset dir="${build.dir}/.gradle/caches">
+            <include name="modules*/files*/**/*.jar"/>
+
+            <exclude name="commons-io-1.4.jar"/>
+            <exclude name="commons-lang3-3.1.jar"/>
+            <exclude name="modules*/files*/commons-io/commons-io/1.4/**/*.jar"/>
+            <exclude name="modules*/files*/com.google.guava/guava/14*/**/*.jar"/>
+            <exclude name="modules*/files*/com.google.guava/guava/15*/**/*.jar"/>
+        </fileset-->
+    </path>
+    <path id="gson">
+        <!--fileset dir="${build.dir}/.gradle/caches">
+            <include name="modules*/files*/com.google.code.gson/**/*.jar"/>
+        </fileset-->
+    </path>
+    <!-- Task skipping -->
+    <target name="properties">
+        <!-- Enforce some paths -->
+        <mkdir dir="${build.dir}"/>
+        <mkdir dir="${download.dir}"/>
+        <!-- Set properties -->
+        <available property="has.api" file="${src.dir}/${class.pckg}/api"/>
+        <available property="forge.exists" file="${download.dir}/forge-${forge.version}-src.zip"/>
+        <available property="bon.exists" file="${reobf.cmd}"/>
+        <condition property="forge.already.installed">
+            <available file="${forge.jar}" type="file"/>
+        </condition>
+        <condition property="have.libs">
+            <and>
+                <istrue value="${forge.exists}"/>
+            </and>
+        </condition>
+    </target>
+    <!-- Dependency downloading -->
+    <target name="download-core" depends="properties" unless="forge.exists">
+    </target>
+    <target name="get-dependencies" depends="get-version" unless="have.libs">
+        <delete dir="${library.download.dir}/"/>
+        <mkdir dir="${library.download.dir}/"/>
+        <echo message="Downloading libs"/>
+
+        <get src="http://files.minecraftforge.net/maven/codechicken/ForgeMultipart/1.7.2-1.1.0.268/ForgeMultipart-1.7.2-1.1.0.268-dev.jar"
+             dest="${library.download.dir}/FMP.jar"/>
+        <get src="http://dvs1.progwml6.com/files/maven/tconstruct/TConstruct/1.7.2-1.6.0.jenkins494/TConstruct-1.7.2-1.6.0.jenkins494-deobf.jar"
+             dest="${library.download.dir}/TCONSTRUCT.jar"/>
+        <get src="http://dvs1.progwml6.com/files/maven/mantle/Mantle/1.7.2-145.3a637c2/Mantle-1.7.2-145.3a637c2-deobf.jar"
+             dest="${library.download.dir}/MANTLE.jar"/>
+        <!-- Begin hack -->
+        <delete dir="${compile.dir}" failonerror="false"/>
+        <!-- End hack -->
+    </target>
+    <!-- Building process -->
+    <target name="install" depends="build">
+        <!-- Cleanup -->
+        <delete dir="${apiclasses.dir}"/>
+        <delete dir="${classes.dir}"/>
+        <delete>
+            <fileset dir="${dist.dir}">
+                <exclude name="${build.name}${build.full}${build.number}.jar"/>
+                <exclude name="${build.name}${build.full}dev-${build.number}.jar"/>
+                <exclude name="${build.name}-API${build.full}${build.number}.zip"/>
+            </fileset>
+        </delete>
+    </target>
+    <macrodef name="install-lite">
+        <attribute name="build"/>
+        <attribute name="classes" default="${compile.dir}"/>
+        <sequential>
+            <copy todir="${classes.dir}" preservelastmodified="true">
+                <fileset dir="@{classes}">
+                    <include name="**/*.class"/>
+                </fileset>
+                <fileset dir="${resources.dir}"/>
+            </copy>
+            <update-languages/>
+            <manifest file="${classes.dir}/MANIFEST.MF">
+                <attribute name="FMLCorePlugin" value="cofh.asm.LoadingPlugin"/>
+                <attribute name="FMLCorePluginContainsFMLMod" value="true"/>
+            </manifest>
+            <jar destfile="${dist.dir}/${build.name}${build.full}@{build}.jar"
+                 compress="true" level="9" basedir="${classes.dir}"
+                 manifest="${classes.dir}/MANIFEST.MF">
+                <exclude name="MANIFEST.MF"/>
+            </jar>
+        </sequential>
+    </macrodef>
+    <target name="build" depends="get-dependencies,get-build-number,copy-sources">
+        <!-- Recompile -->
+        <echo message="Compiling..."/>
+        <mkdir dir="${compile.dir}"/>
+        <depend srcdir="${sources.dir}" destdir="${compile.dir}"
+                cache="${forgebuild.dir}/tmp/depcache" closure="true">
+            <include name="**/*.java"/>
+        </depend>
+
+        <!--Print out detailed classpath-->
+        <pathconvert pathsep="${line.separator}|   |-- "
+                     property="echo.path.compile"
+                     refid="lib.classpath">
+        </pathconvert>
+        <echo message="|-- compile classpath"/>
+        <echo message="|   |"/>
+        <echo message="|   |-- ${echo.path.compile}"/>
+
+        <javac srcdir="${sources.dir}" destdir="${compile.dir}" target="1.6" source="1.6"
+               classpathref="lib.classpath" debug="true" debuglevel="lines,source" includeAntRuntime="false">
+            <include name="**/*.java"/>
+        </javac>
+        <!-- Dev jar -->
+        <echo message="Building jar..."/>
+        <local name="build"/>
+        <property name="build" value="dev-${build.number}"/>
+        <install-lite build="${build}"/>
+        <!-- Reobf -->
+        <echo message="Reobfuscating..."/>
+        <java classpath="${reobf.cmd}" classname="immibis.bon.cui.MCPRemap">
+            <arg line="-q -m"/>
+            <arg value="-to SRG"/>
+            <arg value="-from MCP"/>
+            <arg value="-mcp ${forge.stsh}/unpacked"/>
+            <arg value="-in ${dist.dir}/${build.name}${build.full}${build}.jar"/>
+            <arg value="-out ${dist.dir}/${build.name}${build.full}${build.number}.jar"/>
+            <arg value="-ref ${forge.jar}"/>
+            <arg value="-jref ${lib.dir}"/>
+        </java>
+    </target>
+    <target name="copy-sources" depends="package-api">
+        <!-- Copy source -->
+        <mkdir dir="${sources.dir}"/>
+        <sync todir="${sources.dir}">
+            <fileset dir="${src.dir}"/>
+            <fileset dir="${api.dir}"/>
+        </sync>
+    </target>
+    <target name="package-api" depends="get-version" if="has.api">
+        <!-- Copy & package API -->
+        <copy todir="${apiclasses.dir}/${class.pckg}/api">
+            <fileset dir="${src.dir}/${class.pckg}/api"/>
+        </copy>
+        <zip destfile="${dist.dir}/${build.name}-API${build.full}${build.number}.zip" basedir="${apiclasses.dir}"/>
+    </target>
+    <target name="setup-forge" depends="download-forge" unless="forge.already.installed">
+        <delete dir="${forge.dir}" failonerror="false"/>
+        <mkdir dir="${forge.dir}"/>
+        <unzip dest="${forge.dir}">
+            <fileset dir="${download.dir}">
+                <include name="forge-${forge.version}-src.zip"/>
+            </fileset>
+        </unzip>
+        <!-- Cleanup -->
+        <delete>
+            <fileset dir="${forge.dir}">
+                <include name="*.txt"/>
+                <include name="src/**/*.info"/>
+            </fileset>
+        </delete>
+        <delete dir="${forge.dir}/eclipse" failonerror="false"/>
+        <delete dir="${forge.dir}/src/main/java" failonerror="false"/>
+        <delete dir="${build.dir}/.gradle/caches/minecraft/net/minecraftforge/forge/${forge.version}/srgs"
+                failonerror="false"/>
+        <!-- Change executables' permissions -->
+        <chmod file="${forge.dir}/gradlew" perm="+x"/>
+        <copy file="${resources.dir}/ThaumicTinkerer_at.cfg" tofile="${transformers.dir}/ThaumicTinkerer_at.cfg"/>
+        <!-- Install forge -->
+        <exec executable="./gradlew" failonerror="true" dir="${forge.dir}/" vmlauncher="false">
+            <arg line="-g ../.gradle"/>
+            <arg line="extractMinecraftSrc"/>
+            <arg line="eclipseClasspath"/>
+        </exec>
+        <mkdir dir="${compile.dir}"/>
+        <mkdir dir="${lib.dir}"/>
+        <javac srcdir="${forgebuild.dir}/tmp/recompSrc" destdir="${compile.dir}" target="1.6" source="1.6"
+               classpathref="lib.classpath" debug="true" debuglevel="lines,source" includeAntRuntime="false"/>
+        <jar destfile="${forge.jar}" compress="true" level="9" basedir="${compile.dir}"/>
+        <copy file="${forge.jar}" todir="${forgebuild.dir}/dirtyArtifacts/"/>
+        <delete dir="${compile.dir}"/>
+    </target>
+    <target name="download-forge" depends="setup-bon,download-core" unless="forge.exists">
+        <echo message="Downloading forge... "/>
+        <get src="${forge.url}" dest="${download.dir}/forge-${forge.version}-src.zip"/>
+    </target>
+    <target name="setup-bon" depends="properties" unless="bon.exists">
+        <echo message="Downloading BON..."/>
+        <get src="https://github.com/skyboy/bearded-octo-nemesis/releases/download/1.1/BON.jar" dest="${reobf.cmd}"/>
+    </target>
+    <macrodef name="update-languages">
+        <sequential>
+            <script language="javascript"><![CDATA[
+importPackage(java.io);
+var path = "/assets/cofh/language/";
+var languages = new File(project.getProperty("resources.dir") + path);
+if (languages.exists() && languages.isDirectory()) {
+var out = "";
+for each(var i in languages.list()) {
+if (i != null && i.length() > 5 && i.indexOf(".lang") == i.length() - 5) {
+out += i.substring(0, i.length() - 5) + ", ";
+}
+}
+if (out.length > 0) {
+var os = new PrintWriter(project.getProperty("classes.dir") + path + ".languages");
+os.write("["+out.substring(0, out.length - 2)+"]");
+os.flush();
+os.close();
+}
+}
+]]></script>
+        </sequential>
+    </macrodef>
+    <target name="verify-version">
+        <script language="javascript"><![CDATA[
+var name = project.getProperty("build.full");
+if (name == null || name == "") {
+name = project.getProperty("verclass.name");
+if (name == null || name == "") {
+project.setProperty("build.full", "-");
+}
+}
+]]></script>
+    </target>
+    <target name="get-version" depends="verify-version,setup-forge" unless="build.full">
+        <local name="grep.out"/>
+        <local name="mfrv"/>
+        <local name="mcv"/>
+        <!-- Read version out of file -->
+        <property name="version" value="2.4"/>
+        <!-- Split mod&mc version, update mcmod -->
+        <property name="build.full" value="-[${mcv}]${mfrv}-"/>
+    </target>
+    <target name="get-build-number" depends="build-number-there" unless="build.number">
+        <echo message="!! No build number set !!"/>
+        <property name="build.number" value="CUSTOM_BUILD"/>
+    </target>
+    <target name="build-number-there" depends="get-version" if="env.BUILD_NUMBER" unless="build.number">
+        <echo message="Using build number ${env.BUILD_NUMBER}..."/>
+        <property name="build.number" value="${env.BUILD_NUMBER}"/>
+    </target>
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+    <target name="rebuild">
+        <delete file="${forge.jar}" failonerror="false"/>
+        <delete dir="${forge.dir}"/>
+        <delete dir="${download.dir}"/>
+        <antcall target="install"/>
+    </target>
+    <target name="refresh-deps">
+        <delete dir="${lib.dir}"/>
+        <delete dir="${download.dir}"/>
+        <antcall target="install"/>
+    </target>
+    <target name="jar" depends="install"/>
+</project>
diff --git a/config/forge.cfg b/config/forge.cfg
new file mode 100644
index 00000000..c6e5d21c
--- /dev/null
+++ b/config/forge.cfg
@@ -0,0 +1,54 @@
+# Configuration file
+
+general {
+    # Set to true to disable Forge's version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.
+    B:disableVersionCheck=false
+
+    # Controls the number threshold at which Packet51 is preferred over Packet52, default and minimum 64, maximum 1024
+    I:clumpingThreshold=64
+
+    # Set to true to enable the post initialization sorting of crafting recipes using Forge's sorter. May cause desyncing on conflicting recipies. MUST RESTART MINECRAFT IF CHANGED FROM THE CONFIG GUI.
+    B:sortRecipies=true
+
+    # Set this to true to force a crash if more than one block attempts to link back to the same Fluid. Enabled by default.
+    B:forceDuplicateFluidBlockCrash=true
+
+    # Set this to true to remove any Entity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.
+    B:removeErroringEntities=false
+
+    # Set this to true to remove any TileEntity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.
+    B:removeErroringTileEntities=false
+
+    # Set this to true to check the entire entity's collision bounding box for ladders instead of just the block they are in. Causes noticable differences in mechanics so default is vanilla behavior. Default: false
+    B:fullBoundingBoxLadders=false
+
+    # Control the range of sky blending for colored skies in biomes.
+    I:biomeSkyBlendRange <
+        2
+        4
+        6
+        8
+        10
+        12
+        14
+        16
+        18
+        20
+        22
+        24
+        26
+        28
+        30
+        32
+        34
+     >
+
+    # Base zombie summoning spawn chance. Allows changing the bonus zombie summoning mechanic.
+    D:zombieBaseSummonChance=0.1
+
+    # Chance that a zombie (or subclass) is a baby. Allows changing the zombie spawning mechanic.
+    D:zombieBabyChance=0.05
+    B:enableGlobalConfig=false
+}
+
+
diff --git a/gradle/.gradle/1.12/taskArtifacts/cache.properties b/gradle/.gradle/1.12/taskArtifacts/cache.properties
new file mode 100644
index 00000000..c795b17e
--- /dev/null
+++ b/gradle/.gradle/1.12/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Sun Jun 29 10:07:24 EDT 2014
diff --git a/gradle/.gradle/1.12/taskArtifacts/cache.properties.lock b/gradle/.gradle/1.12/taskArtifacts/cache.properties.lock
new file mode 100644
index 00000000..40f16f93
Binary files /dev/null and b/gradle/.gradle/1.12/taskArtifacts/cache.properties.lock differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/fileHashes.bin b/gradle/.gradle/1.12/taskArtifacts/fileHashes.bin
new file mode 100644
index 00000000..d0804119
Binary files /dev/null and b/gradle/.gradle/1.12/taskArtifacts/fileHashes.bin differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/fileSnapshots.bin b/gradle/.gradle/1.12/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 00000000..c8d51669
Binary files /dev/null and b/gradle/.gradle/1.12/taskArtifacts/fileSnapshots.bin differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/outputFileStates.bin b/gradle/.gradle/1.12/taskArtifacts/outputFileStates.bin
new file mode 100644
index 00000000..b3d70650
Binary files /dev/null and b/gradle/.gradle/1.12/taskArtifacts/outputFileStates.bin differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/taskArtifacts.bin b/gradle/.gradle/1.12/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 00000000..378fb873
Binary files /dev/null and b/gradle/.gradle/1.12/taskArtifacts/taskArtifacts.bin differ
diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..0087cd3b
Binary files /dev/null and b/gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..a6ef9912
--- /dev/null
+++ b/gradle/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Jun 29 10:07:25 EDT 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/gradle/gradlew b/gradle/gradlew
new file mode 100755
index 00000000..91a7e269
--- /dev/null
+++ b/gradle/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradle/gradlew.bat b/gradle/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/gradle/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/remake.sh~ b/remake.sh~
new file mode 100755
index 00000000..9a2f91ff
--- /dev/null
+++ b/remake.sh~
@@ -0,0 +1,4 @@
+gradle clean cleanCache --refresh-dependencies
+gradle setupDecompWorkspace
+gradle idea
+gradle genIntellijRuns
diff --git a/src/main/java/thaumic/tinkerer/common/item/ItemInfusedSeeds.java b/src/main/java/thaumic/tinkerer/common/item/ItemInfusedSeeds.java
index 2bb66adf..9809eb84 100644
--- a/src/main/java/thaumic/tinkerer/common/item/ItemInfusedSeeds.java
+++ b/src/main/java/thaumic/tinkerer/common/item/ItemInfusedSeeds.java
@@ -176,17 +176,17 @@ public class ItemInfusedSeeds extends ItemSeeds implements ITTinkererItem {
     @Override
     public ThaumicTinkererRecipe getRecipeItem() {
         return new ThaumicTinkererRecipeMulti(
-                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 0, getStackFromAspect(Aspect.AIR), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 0)),
+                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 0, LibResearch.KEY_POTIONS, getStackFromAspect(Aspect.AIR), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 0)),
 
-                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 1, getStackFromAspect(Aspect.FIRE), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 1)),
+                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 1, LibResearch.KEY_POTIONS, getStackFromAspect(Aspect.FIRE), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 1)),
 
-                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 2, getStackFromAspect(Aspect.EARTH), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 3)),
+                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 2, LibResearch.KEY_POTIONS, getStackFromAspect(Aspect.EARTH), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 3), new ItemStack(ConfigItems.itemShard, 1, 3)),
 
-                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 3, getStackFromAspect(Aspect.WATER), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 2)),
+                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 3, LibResearch.KEY_POTIONS, getStackFromAspect(Aspect.WATER), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 2), new ItemStack(ConfigItems.itemShard, 1, 2)),
 
 
-                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 4, getStackFromAspect(Aspect.ORDER), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 4)),
-                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 5, getStackFromAspect(Aspect.ENTROPY), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 5))
+                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 4, LibResearch.KEY_POTIONS, getStackFromAspect(Aspect.ORDER), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 4)),
+                new ThaumicTinkererInfusionRecipe(LibResearch.KEY_POTIONS + 5, LibResearch.KEY_POTIONS, getStackFromAspect(Aspect.ENTROPY), 5, new AspectList().add(Aspect.CROP, 32).add(Aspect.HARVEST, 32), new ItemStack(Items.wheat_seeds), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigItems.itemShard, 1, 5))
         );
     }