From b431cc6b5e1fc39ad4975f4cc92529c1041a11bc Mon Sep 17 00:00:00 2001 From: DarkGaurdsman Date: Mon, 30 Dec 2013 14:34:50 -0500 Subject: [PATCH] Disabled mulit part wires for the moment --- .gitmodules | 5 +---- Universal-Electricity | 2 +- src/main/java/com/builtbroken/assemblyline/AssemblyLine.java | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5b5204cf..d2b6de95 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,4 @@ url = https://github.com/DarksCoreMachine/CoreLibrary.git [submodule "Built-Broken-Lib"] path = Built-Broken-Lib - url = https://github.com/DarkGuardsman/Built-Broken-Lib.git -[submodule "Universal-Electricity"] - path = Universal-Electricity - url = https://github.com/Universal-Electricity/Universal-Electricity.git + url = https://github.com/DarkGuardsman/Built-Broken-Lib.git \ No newline at end of file diff --git a/Universal-Electricity b/Universal-Electricity index 117d3ca1..a33b93b4 160000 --- a/Universal-Electricity +++ b/Universal-Electricity @@ -1 +1 @@ -Subproject commit 117d3ca17939777f44bf413404c673f37db545e0 +Subproject commit a33b93b4b5aa5a7049b3f4daa4a9c9650298d00b diff --git a/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java b/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java index b2a5961d..6617693e 100644 --- a/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java +++ b/src/main/java/com/builtbroken/assemblyline/AssemblyLine.java @@ -305,7 +305,7 @@ public class AssemblyLine ALRecipeLoader.itemParts = CoreRegistry.createNewItem("DMCraftingParts", AssemblyLine.MOD_ID, ItemParts.class, true); ALRecipeLoader.itemMetals = CoreRegistry.createNewItem("DMOreDirvParts", AssemblyLine.MOD_ID, ItemOreDirv.class, true); - ALRecipeLoader.itemMPWire = CoreRegistry.createNewItem("DMMPWire", AssemblyLine.MOD_ID, ItemWire.class, true); + //ALRecipeLoader.itemMPWire = CoreRegistry.createNewItem("DMMPWire", AssemblyLine.MOD_ID, ItemWire.class, true); TileEntityAssembly.refresh_diff = CONFIGURATION.get("TileSettings", "RefreshRandomRange", 9, "n = value of config, 1 + n, random number range from 1 to n that will be added to the lowest refresh value").getInt(); TileEntityAssembly.refresh_min_rate = CONFIGURATION.get("TileSettings", "RefreshLowestValue", 20, "Lowest value the refresh rate of the tile network will be").getInt();