From 2ad37c1990992bb740cce117c4f950d6f5863fb8 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 23 Feb 2015 06:52:47 -0500 Subject: [PATCH] Fix missing conduit textures --- .../blocks/{old => }/liquidConduitExtract.png | Bin .../blocks/{old => }/liquidConduitInsert.png | Bin .../textures/blocks/old/liquidConduitLocked.png | Bin 470 -> 0 bytes .../blocks/old/powerConduitTransmission.png | Bin 172 -> 0 bytes .../enderio/thaumcraft/ThaumcraftCompat.java | 1 - 5 files changed, 1 deletion(-) rename resources/assets/enderio/textures/blocks/{old => }/liquidConduitExtract.png (100%) rename resources/assets/enderio/textures/blocks/{old => }/liquidConduitInsert.png (100%) delete mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitLocked.png delete mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitTransmission.png 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 c84546d8d8de1ca7a5d0673e5703c2468ce4d9eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmV;{0V)28P)N2bPDNB8 zb~7$DE-^7j^FlWO00B}-L_t(oN9~u{Zi6roMfv|PYL&8Y1_}(2KIJp~9(S%S($Kh3 z6O~0O4@VZ(m^rpE9y{LQRR!Lg3VrvNcq+Okc!JQ^E%G|Pdr)Z{sv^%+De{NlF;e8| zxe%GGid@|ytYB=GL|Vdu1(J8v$ex;0*Vfd3hwM;Yy-;0h25RU>x{;QSJ)O9fB@4#9 z5?TO8NUoG}mH-k}DW(FLxh;4Ouo5={SZZ7F9IP&I+yz+ReG~{i*9h>ovIWn<`U3r? z1o;2HyZ{-2XcXYz;syko6$An!fRk%^fnt4uIvQGh!ayO?|o-Dx6#<9O&uLIU;L1g>5T^d}(s(38AW#n^^f z5^D)`0-V+NDZb#DJPLB;X>0^=JH{&D;VxXg7=jDAMR_U3K6A;}WTVrx_V$udo;RB>N~5sEonW)z4*} HQ$iB}V8|_u 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;