aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/miscutil')
-rw-r--r--src/Java/miscutil/core/lib/CORE.java2
-rw-r--r--src/Java/miscutil/gregtech/init/machines/GregtechConduits.java14
-rw-r--r--src/Java/miscutil/mcmod.info2
3 files changed, 12 insertions, 6 deletions
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 956f3f0898..93ff389810 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -6,7 +6,7 @@ public class CORE {
public static final String name = "Misc. Utils";
public static final String MODID = "miscutils";
- public static final String VERSION = "0.9.4_public_gregtech5u";
+ public static final String VERSION = "0.9.6";
public static final boolean DEBUG = false;
public static final boolean LOAD_ALL_CONTENT = false;
public static final int GREG_FIRST_ID = 760;
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java b/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java
index 70933e917d..4763d325d6 100644
--- a/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java
+++ b/src/Java/miscutil/gregtech/init/machines/GregtechConduits.java
@@ -5,6 +5,7 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_OreDictUnificator;
+import miscutil.core.lib.LoadedMods;
import miscutil.core.util.Utils;
import miscutil.gregtech.metatileentity.implementations.GregtechMetaPipeEntity_Cable;
@@ -27,10 +28,15 @@ public class GregtechConduits {
}
private static void run1(){
- wireFactory("Blutonium", 8196, 30600, 1, 8, 2);
- wireFactory("RedstoneAlloy", 32, 30615, 3,6,9);
- wireFactory("Cyanite", 512, 30630, 4, 8, 1);
- wireFactory("Yellorium", 2048, 30645, 4, 8, 1);
+ if (LoadedMods.Big_Reactors){
+ wireFactory("Blutonium", 8196, 30600, 8, 32, 2);
+ wireFactory("Cyanite", 512, 30615, 2, 16, 4);
+ wireFactory("Yellorium", 2048, 30630, 4, 16, 2);
+ }
+ if (LoadedMods.EnderIO){
+ wireFactory("RedstoneAlloy", 32, 30645, 1, 4, 1);
+ }
+
}
private static void wireFactory(String Material, int Voltage, int ID, long insulatedLoss, long uninsulatedLoss, long Amps){
diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info
index 2e5296f586..3e9f0a5d47 100644
--- a/src/Java/miscutil/mcmod.info
+++ b/src/Java/miscutil/mcmod.info
@@ -6,7 +6,7 @@
[ { "modid" : "miscutil"
, "name" : "miscutils"
, "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks."
- , "version" : "0.9.4_public_gregtech5u"
+ , "version" : "0.9.6"
, "mcversion" : "1.7.10"
, "url" : ""
, "updateUrl" : ""