aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_Proxy.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-09 18:44:14 +0200
committerDream-Master <dream-master@gmx.net>2018-09-09 18:44:14 +0200
commit312eca2c7d25a0cc1873cff0142f007d90e689ff (patch)
tree2660535a47ebcb2a8fe74e7a879ee3035188e355 /src/main/java/gregtech/common/GT_Proxy.java
parent461679a56e203e65578ad20f2723b2df93020dd7 (diff)
parent2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40 (diff)
downloadGT5-Unofficial-312eca2c7d25a0cc1873cff0142f007d90e689ff.tar.gz
GT5-Unofficial-312eca2c7d25a0cc1873cff0142f007d90e689ff.tar.bz2
GT5-Unofficial-312eca2c7d25a0cc1873cff0142f007d90e689ff.zip
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into GT_Bees_dev
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index ddae83ff32..5b3c4e8b79 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -207,6 +207,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public boolean enableBasaltOres = true;
public boolean gt6Pipe = true;
public boolean gt6Cable = true;
+ public boolean ic2EnergySourceCompat = true;
public boolean costlyCableConnection = false;
public GT_Proxy() {