aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-02-27 01:20:46 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-02-27 01:20:46 +1000
commita5f204e455497f34eb88e3b19f636272beb44cce (patch)
tree9cb82cf90a08c9ea4cc688ce5e2da7300a953d0c /src
parentdccabf64c5675d34da85dda7fb8b764ae1d1becc (diff)
downloadGT5-Unofficial-a5f204e455497f34eb88e3b19f636272beb44cce.tar.gz
GT5-Unofficial-a5f204e455497f34eb88e3b19f636272beb44cce.tar.bz2
GT5-Unofficial-a5f204e455497f34eb88e3b19f636272beb44cce.zip
Tidying things again..
Diffstat (limited to 'src')
-rw-r--r--src/Java/miscutil/enderio/conduit/GregTech/AbstractGtTankConduitNetwork.java2
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang3
2 files changed, 4 insertions, 1 deletions
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