aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2018-09-09 18:43:53 +0200
committerGitHub <noreply@github.com>2018-09-09 18:43:53 +0200
commit2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40 (patch)
tree21a49af7565123014ac045e6a0ed41c7f3914776 /src/main/java/gregtech/common
parent2aeb6e2ca7fb090d2392490aff6d6f87be48fd19 (diff)
parent6e6baf615dfcef4aa684fbe50816ed184d1ed6a5 (diff)
downloadGT5-Unofficial-2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40.tar.gz
GT5-Unofficial-2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40.tar.bz2
GT5-Unofficial-2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40.zip
Merge pull request #148 from GTNewHorizons/GC_Compat
GC Energy Compatibility & TransferEnergy updates
Diffstat (limited to 'src/main/java/gregtech/common')
-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() {