diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitExtract.png b/resources/assets/enderio/textures/blocks/liquidConduitExtract.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitExtract.png rename to resources/assets/enderio/textures/blocks/liquidConduitExtract.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitInsert.png b/resources/assets/enderio/textures/blocks/liquidConduitInsert.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitInsert.png rename to resources/assets/enderio/textures/blocks/liquidConduitInsert.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitLocked.png b/resources/assets/enderio/textures/blocks/old/liquidConduitLocked.png deleted file mode 100644 index c84546d8..00000000 Binary files a/resources/assets/enderio/textures/blocks/old/liquidConduitLocked.png and /dev/null differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitTransmission.png b/resources/assets/enderio/textures/blocks/old/powerConduitTransmission.png deleted file mode 100644 index e9c432c8..00000000 Binary files a/resources/assets/enderio/textures/blocks/old/powerConduitTransmission.png and /dev/null differ diff --git a/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java b/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java index cc1cd5f4..37ee946d 100644 --- a/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java +++ b/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java @@ -15,7 +15,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import cpw.mods.fml.common.Loader; import crazypants.enderio.EnderIO; -import crazypants.enderio.item.darksteel.DarkSteelRecipeManager; import crazypants.enderio.item.darksteel.IDarkSteelUpgrade; import crazypants.enderio.item.skull.BlockEndermanSkull.SkullType; import crazypants.enderio.material.Alloy;