aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/GT_Mod.java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-11-25 18:45:33 +0100
committerGitHub <noreply@github.com>2017-11-25 18:45:33 +0100
commit7cc77f5abfce652c50f7876af236dc057a0ce209 (patch)
tree9ad3fcaef69c67c9451413a0ab958c2472cd8365 /src/main/java/gregtech/GT_Mod.java
parent1c9c9af45bfa46278ed4840c3c6ae1459879d2fe (diff)
parent9ea8a856090db86512b0b20e684112c632ac1fb2 (diff)
downloadGT5-Unofficial-7cc77f5abfce652c50f7876af236dc057a0ce209.tar.gz
GT5-Unofficial-7cc77f5abfce652c50f7876af236dc057a0ce209.tar.bz2
GT5-Unofficial-7cc77f5abfce652c50f7876af236dc057a0ce209.zip
Merge pull request #1264 from Antifluxfield/GT6-styled_pipes
GT6 Styled Pipes & Cables
Diffstat (limited to 'src/main/java/gregtech/GT_Mod.java')
-rw-r--r--src/main/java/gregtech/GT_Mod.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 7cfbeb6103..dad39c914d 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -281,6 +281,9 @@ public class GT_Mod implements IGT_Mod {
gregtechproxy.enableBasaltOres = GregTech_API.sWorldgenFile.get("general", "enableBasaltOres", gregtechproxy.enableBasaltOres);
gregtechproxy.enableGCOres = GregTech_API.sWorldgenFile.get("general", "enableGCOres", gregtechproxy.enableGCOres);
gregtechproxy.enableUBOres = GregTech_API.sWorldgenFile.get("general", "enableUBOres", gregtechproxy.enableUBOres);
+ gregtechproxy.gt6Pipe = tMainConfig.get("general", "GT6StyledPipesConnection", true).getBoolean(true);
+ gregtechproxy.gt6Cable = tMainConfig.get("general", "GT6StyledWiresConnection", false).getBoolean(false);
+ gregtechproxy.costlyCableConnection = tMainConfig.get("general", "CableConnectionRequiresSolderingMaterial", false).getBoolean(false);
Materials[] tDisableOres = new Materials[]{Materials.Chrome, Materials.Naquadria, Materials.Silicon, Materials.Cobalt, Materials.Cadmium, Materials.Indium, Materials.Tungsten,
Materials.Adamantium, Materials.Mithril, Materials.DarkIron, Materials.Rutile, Materials.Alduorite, Materials.Magnesium, Materials.Nikolite};