diff --git a/.gitignore.orig b/.gitignore.orig
deleted file mode 100644
index 766bc9f2..00000000
--- a/.gitignore.orig
+++ /dev/null
@@ -1,51 +0,0 @@
-*.class
-dist
-download
-push.sh
-remotebuild.py
-
-## gradle
-/.gradle
-/build
-/eclipse
-/gradlew.bat
-
-## ForgeGradle
-/run
-/out
-/ForgeModule
-/libs/download
-
-## idea
-*.iml
-*.ipr
-*.iws
-
-## eclipse
-/.settings
-/.metadata
-/.classpath
-/.project
-/bin
-/.idea
-/client/
-/Server/
-/classes/
-## misc
-/libs/Thaumcraft-deobf*.jar*
-<<<<<<< HEAD
-/libs/Ender*
-=======
-/libs/*1.7.10*
->>>>>>> develop
-TCDEOBF*
-## Ignore OS cache files
-*.DS_Store
-_MACOSX
-Thumbs.db
-/forgelibs
-
-## Ignore unnecessary files
-*.log
-*.lck
-/target/
diff --git a/Cleanup Profile.xml b/Cleanup Profile.xml
deleted file mode 100644
index 5b655d14..00000000
--- a/Cleanup Profile.xml	
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="2">
-    <profile kind="CleanUpProfile" name="ThaumicTinkererCleanup" version="2">
-        <setting id="cleanup.remove_unused_private_fields" value="true"/>
-        <setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
-        <setting id="cleanup.never_use_blocks" value="false"/>
-        <setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
-        <setting id="cleanup.remove_unused_private_methods" value="true"/>
-        <setting id="cleanup.convert_to_enhanced_for_loop" value="true"/>
-        <setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
-        <setting id="cleanup.sort_members" value="false"/>
-        <setting id="cleanup.remove_unused_local_variables" value="true"/>
-        <setting id="cleanup.remove_unused_private_members" value="true"/>
-        <setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
-        <setting id="cleanup.remove_unnecessary_casts" value="true"/>
-        <setting id="cleanup.make_parameters_final" value="false"/>
-        <setting id="cleanup.use_this_for_non_static_field_access" value="true"/>
-        <setting id="cleanup.use_blocks" value="false"/>
-        <setting id="cleanup.remove_private_constructors" value="true"/>
-        <setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
-        <setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
-        <setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
-        <setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
-        <setting id="cleanup.add_default_serial_version_id" value="false"/>
-        <setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
-        <setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
-        <setting id="cleanup.make_variable_declarations_final" value="false"/>
-        <setting id="cleanup.add_missing_nls_tags" value="false"/>
-        <setting id="cleanup.format_source_code" value="false"/>
-        <setting id="cleanup.add_missing_override_annotations" value="true"/>
-        <setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
-        <setting id="cleanup.remove_unused_private_types" value="true"/>
-        <setting id="cleanup.make_local_variable_final" value="true"/>
-        <setting id="cleanup.add_missing_methods" value="false"/>
-        <setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
-        <setting id="cleanup.correct_indentation" value="false"/>
-        <setting id="cleanup.remove_unused_imports" value="true"/>
-        <setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
-        <setting id="cleanup.make_private_fields_final" value="true"/>
-        <setting id="cleanup.add_generated_serial_version_id" value="true"/>
-        <setting id="cleanup.organize_imports" value="true"/>
-        <setting id="cleanup.sort_members_all" value="false"/>
-        <setting id="cleanup.remove_trailing_whitespaces" value="true"/>
-        <setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
-        <setting id="cleanup.use_parentheses_in_expressions" value="true"/>
-        <setting id="cleanup.add_missing_annotations" value="true"/>
-        <setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
-        <setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
-        <setting id="cleanup.use_this_for_non_static_method_access" value="true"/>
-        <setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
-        <setting id="cleanup.add_serial_version_id" value="true"/>
-        <setting id="cleanup.always_use_blocks" value="true"/>
-        <setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
-        <setting id="cleanup.format_source_code_changes_only" value="false"/>
-    </profile>
-</profiles>
diff --git a/Code Template.xml b/Code Template.xml
deleted file mode 100644
index 5b778c3b..00000000
--- a/Code Template.xml	
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<templates>
-    <template autoinsert="false" context="gettercomment_context" deleted="false" description="Comment for getter method"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment"/>
-    <template autoinsert="false" context="settercomment_context" deleted="false" description="Comment for setter method"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment"/>
-    <template autoinsert="false" context="constructorcomment_context" deleted="false"
-              description="Comment for created constructors" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment"/>
-    <template autoinsert="false" context="filecomment_context" deleted="false"
-              description="Comment for created Java files" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/**
-        * This class was created by &lt;Vazkii&gt;. It's distributed as
-        * part of the ${project_name} Mod.
-        *
-        * ${project_name} is Open Source and distributed under a
-        * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
-        * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
-        *
-        * ${project_name} is a Derivative Work on Thaumcraft 4.
-        * Thaumcraft 4 (c) Azanor 2012
-        * (http://www.minecraftforum.net/topic/1585216-)
-        *
-        * File Created @ [${date}, ${time} (GMT)]
-        */
-    </template>
-    <template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment"/>
-    <template autoinsert="false" context="fieldcomment_context" deleted="false" description="Comment for fields"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment"/>
-    <template autoinsert="false" context="methodcomment_context" deleted="false"
-              description="Comment for non-overriding methods" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment"/>
-    <template autoinsert="false" context="overridecomment_context" deleted="false"
-              description="Comment for overriding methods" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment"/>
-    <template autoinsert="false" context="delegatecomment_context" deleted="false"
-              description="Comment for delegate methods" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment"/>
-    <template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-        ${package_declaration}
-
-        ${typecomment}
-        ${type_declaration}
-    </template>
-    <template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
-    </template>
-    <template autoinsert="true" context="interfacebody_context" deleted="false"
-              description="Code in new interface type bodies" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
-    </template>
-    <template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
-    </template>
-    <template autoinsert="true" context="annotationbody_context" deleted="false"
-              description="Code in new annotation type bodies" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
-    </template>
-    <template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo}
-        Auto-generated catch block
-        ${exception_var}.printStackTrace();
-    </template>
-    <template autoinsert="false" context="methodbody_context" deleted="false" description="Code in created method stubs"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody"/>
-    <template autoinsert="true" context="constructorbody_context" deleted="false"
-              description="Code in created constructor stubs" enabled="true"
-              id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-        // ${todo} Auto-generated constructor stub
-    </template>
-    <template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};
-    </template>
-    <template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters"
-              enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} =
-        ${param};
-    </template>
-</templates>
\ No newline at end of file
diff --git a/DummyClasses/thaumcraft/common/lib/Utils.java b/DummyClasses/thaumcraft/common/lib/Utils.java
deleted file mode 100644
index c9b02b9c..00000000
--- a/DummyClasses/thaumcraft/common/lib/Utils.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package thaumcraft.common.lib;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.PlayerCapabilities;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-
-public class Utils {
-public static boolean  breakFurthestBlock(World world, int x,int   y,int   z,int  blockid,EntityPlayer player)
-{
-	return false;
-}
-public static MovingObjectPosition getTargetBlock(World world, Entity entity, boolean par3)
-{
-	return null;
-}
-public static float getWalkSpeed(PlayerCapabilities pc) {
-	return 0.0f;
-}
-public static void setWalkSpeed(PlayerCapabilities pc, float ws)
-{
-	
-}
-public static boolean isWoodLog(World world, int x, int y, int z)
-{
-	return false;
-}
-}
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 6241d5e2..00000000
--- a/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-version=2.5
-build_number=559-GTNH
-mc_version=1.7.10
-mod_name=ThaumicTinkerer
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 3ed2c4c3..00000000
--- a/build.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<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="1199"/>
-    <!-- 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="${
-}"/>
-            </and>
-        </condition>
-    </target>
-    <!-- Dependency downloading -->
-    <target name="download-core" depends="properties">
-    </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">
-    <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/dummyJar/META-INF/MANIFEST.MF b/dummyJar/META-INF/MANIFEST.MF
deleted file mode 100644
index 926d3e53..00000000
--- a/dummyJar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-FMLCorePlugin: tconstruct.preloader.TConstructLoaderContainer
-FMLCorePluginContainsFMLMod: true
-
-
diff --git a/dummyJar/TiCon.jar b/dummyJar/TiCon.jar
deleted file mode 100644
index c6261bb8..00000000
Binary files a/dummyJar/TiCon.jar and /dev/null differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/cache.properties b/gradle/.gradle/1.12/taskArtifacts/cache.properties
deleted file mode 100644
index c795b17e..00000000
--- a/gradle/.gradle/1.12/taskArtifacts/cache.properties
+++ /dev/null
@@ -1 +0,0 @@
-#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
deleted file mode 100644
index 40f16f93..00000000
Binary files a/gradle/.gradle/1.12/taskArtifacts/cache.properties.lock and /dev/null differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/fileHashes.bin b/gradle/.gradle/1.12/taskArtifacts/fileHashes.bin
deleted file mode 100644
index d0804119..00000000
Binary files a/gradle/.gradle/1.12/taskArtifacts/fileHashes.bin and /dev/null differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/fileSnapshots.bin b/gradle/.gradle/1.12/taskArtifacts/fileSnapshots.bin
deleted file mode 100644
index c8d51669..00000000
Binary files a/gradle/.gradle/1.12/taskArtifacts/fileSnapshots.bin and /dev/null differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/outputFileStates.bin b/gradle/.gradle/1.12/taskArtifacts/outputFileStates.bin
deleted file mode 100644
index b3d70650..00000000
Binary files a/gradle/.gradle/1.12/taskArtifacts/outputFileStates.bin and /dev/null differ
diff --git a/gradle/.gradle/1.12/taskArtifacts/taskArtifacts.bin b/gradle/.gradle/1.12/taskArtifacts/taskArtifacts.bin
deleted file mode 100644
index 378fb873..00000000
Binary files a/gradle/.gradle/1.12/taskArtifacts/taskArtifacts.bin and /dev/null differ
diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 0087cd3b..00000000
Binary files a/gradle/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index a6ef9912..00000000
--- a/gradle/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#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
deleted file mode 100755
index 91a7e269..00000000
--- a/gradle/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/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
deleted file mode 100644
index 8a0b282a..00000000
--- a/gradle/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@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/srgobf.bat b/srgobf.bat
deleted file mode 100644
index ae33e13f..00000000
--- a/srgobf.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-java -cp BON.jar immibis.bon.cui.MCPRemap -mcp D:/MCPDev/MCP16/forge/mcp -in TC.zip -out TCDEOBF_IM.zip -side UNIVERSAL -from SRG -to OBF -ref D:/MCPDev/MCP16/forge/mcp/jars/versions/1.6.4/1.6.4.jar
-pause
\ No newline at end of file