aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_Proxy.java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-11-25 18:54:57 +0100
committerGitHub <noreply@github.com>2017-11-25 18:54:57 +0100
commit87210137d0c5821c1791f316710f46da5af91744 (patch)
treeafa588c32c3898b7c69a8cadde8a015fae0b3303 /src/main/java/gregtech/common/GT_Proxy.java
parent5476c4ea3999ebe4b5dd10b002da89b9829e483d (diff)
parenta2c7e3160262b03a10a655a5925b51f5def5e218 (diff)
downloadGT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.tar.gz
GT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.tar.bz2
GT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.zip
Merge branch 'unstable' into CrackingFollowup
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 314070b2ac..dd36364c6e 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -202,6 +202,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public boolean enableBasaltOres = true;
public boolean enableGCOres = true;
public boolean enableUBOres = true;
+ public boolean gt6Pipe = true;
+ public boolean gt6Cable = false;
+ public boolean costlyCableConnection = false;
public GT_Proxy() {
GameRegistry.registerFuelHandler(this);