Tidying things again..

4 files changed, 120 insertions, 3 deletions

diff --git a/.classpath b/.classpath
index f03424b542..84c79230fa 100644
--- a/.classpath
+++ b/.classpath
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="miscutil/enderio/|conduits/" kind="src" path="src/Java"/>
+	<classpathentry excluding="conduits/" kind="src" path="src/Java"/>
 	<classpathentry kind="src" path="src/resources"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Forge"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="libs/industrialcraft-2-2.2.720-experimental-dev.jar"/>
 	<classpathentry kind="lib" path="libs/gregtech_1.7.10-5.08.30-dev.jar"/>
-	<classpathentry kind="lib" path="libs/EnderIO-1.7.10-2.3.0.420_beta-dev.jar"/>
+	<classpathentry kind="lib" path="libs/EnderIO-1.7.10-2.2.8.381-dev.jar" sourcepath="libsrc/EnderIO-1.7.10-2.2.8.381-sources.jar"/>
+	<classpathentry kind="lib" path="libs/appliedenergistics2-rv2-stable-1-dev.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..440eed1aa0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,113 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.log
+*.log.gz
+*.msi
+*.msm
+*.msp
+*.json
+*.txt
+*.zip
+.gradle
+.settings
+asm/
+bin/
+config/
+crash-reports/
+gradle/
+logs/
+mods/
+resourcepacks/
+saves/
+VillageWiper/
+world/
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Created by https://www.gitignore.io/api/eclipse
+
+### Eclipse ###
+
+.metadata
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+/resourcepacks/Forge_GuiLibv1.0.7.2.zip
diff --git a/src/Java/miscutil/enderio/conduit/GregTech/AbstractGtTankConduitNetwork.java b/src/Java/miscutil/enderio/conduit/GregTech/AbstractGtTankConduitNetwork.java
index 8cd720fa18..e48a9b97e5 100644
--- a/src/Java/miscutil/enderio/conduit/GregTech/AbstractGtTankConduitNetwork.java
+++ b/src/Java/miscutil/enderio/conduit/GregTech/AbstractGtTankConduitNetwork.java
@@ -6,7 +6,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
 public class AbstractGtTankConduitNetwork<T extends AbstractGtTankConduit> extends AbstractConduitNetwork<IGtConduit, T> {
 
   protected GasStack gasType;
-
+ private int test;
   protected AbstractGtTankConduitNetwork(Class<T> cl) {
     super(cl);
   }
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 190cd9e9d2..bf9e663cbd 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -35,6 +35,9 @@ item.itemPlateDimensionShard.name=Dimensional Plate
 item.itemIngotBloodSteel.name=Blood Steel Ingot
 item.itemPlateBloodSteel.name=Blood Steel Plate
 
+tile.blockGriefSaver.name=Anti-Griefer [WIP]
+tile.blockStaballoy.name=Block of Staballoy
+
 
 tile.blockBloodSteel.name=Block of Blood Steel
 tile.BloodSteelFurnace.name=Blood Steel Industrial Furnace