Merge pull request #16 from GTNewHorizons/1.12-stuff

1.12 stuff
change version
2026-11-15 17:45:08 +00:00 · 2020-05-10 13:51:46 +02:00 · 2020-05-10 13:47:36 +02:00 · 2020-05-10 13:42:59 +02:00 · 2020-05-10 13:38:46 +02:00 · 2020-05-10 12:36:33 +02:00
130 changed files with 2452 additions and 212 deletions
@@ -38,3 +38,4 @@
 resources/assets/enderio/lang/*.lang.txt
 *.bat
 libs/
+options.txt
@@ -1,8 +1,10 @@
-EnderIO [![Build Status](http://ci.tterrag.com/buildStatus/icon?job=EnderIO)](http://ci.tterrag.com/job/EnderIO/)
+EnderIO-Unofficial
 =======
+[![Build Status](http://jenkins.usrv.eu:8080/buildStatus/icon?job=Ender-IO)](http://jenkins.usrv.eu:8080/job/Ender-IO/)
+This is a unofficial version of EndeIO for 1.7.10, in case of any bugs or problems please do not contact the original developers of EnderIO!

 All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) are released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ).
-Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to **crazypants.mc at gmail.com**.
+Do what you want with it, as long as you smile while doing so.



@@ -2,7 +2,7 @@ minecraft_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
 forgeDep_version=10.13.4.1614

-mod_version=2.3.1.2_beta
+mod_version=2.3.1.10_beta

 #Comment out this line to get rid of the appendix
 #mod_appendix=beta
@@ -19,4 +19,4 @@ opencomputers_version=MC1.7.10-1.5.+

 toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv3-beta-24,)

-curse_projectId=64578
+curse_projectId=379275
@@ -0,0 +1,118 @@
+invertYMouse:false
+mouseSensitivity:0.5
+fov:0.0
+gamma:0.0
+saturation:0.0
+renderDistance:12
+guiScale:3
+particles:0
+bobView:true
+anaglyph3d:false
+advancedOpengl:false
+maxFps:120
+fboEnable:true
+difficulty:2
+fancyGraphics:true
+ao:2
+clouds:true
+resourcePacks:[]
+lastServer:
+lang:en_US
+chatVisibility:0
+chatColors:true
+chatLinks:true
+chatLinksPrompt:true
+chatOpacity:1.0
+snooperEnabled:true
+fullscreen:false
+enableVsync:true
+hideServerAddress:false
+advancedItemTooltips:true
+pauseOnLostFocus:true
+showCape:true
+touchscreen:false
+overrideWidth:0
+overrideHeight:0
+heldItemTooltips:true
+chatHeightFocused:1.0
+chatHeightUnfocused:0.44366196
+chatScale:1.0
+chatWidth:1.0
+showInventoryAchievementHint:false
+mipmapLevels:4
+anisotropicFiltering:1
+streamBytesPerPixel:0.5
+streamMicVolume:1.0
+streamSystemVolume:1.0
+streamKbps:0.5412844
+streamFps:0.31690142
+streamCompression:1
+streamSendMetadata:true
+streamPreferredServer:
+streamChatEnabled:0
+streamChatUserFilter:0
+streamMicToggleBehavior:0
+forceUnicodeFont:false
+key_key.attack:-100
+key_key.use:-99
+key_key.forward:17
+key_key.left:30
+key_key.back:31
+key_key.right:32
+key_key.jump:57
+key_key.sneak:42
+key_key.drop:16
+key_key.inventory:18
+key_key.chat:20
+key_key.playerlist:15
+key_key.pickItem:-98
+key_key.command:53
+key_key.screenshot:60
+key_key.togglePerspective:63
+key_key.smoothCamera:0
+key_key.sprint:29
+key_key.streamStartStop:64
+key_key.streamPauseUnpause:65
+key_key.streamCommercial:0
+key_key.streamToggleMic:0
+key_key.fullscreen:87
+key_key.hotbar.1:2
+key_key.hotbar.2:3
+key_key.hotbar.3:4
+key_key.hotbar.4:5
+key_key.hotbar.5:6
+key_key.hotbar.6:7
+key_key.hotbar.7:8
+key_key.hotbar.8:9
+key_key.hotbar.9:10
+key_key.charge:47
+key_key.extra:46
+key_key.release:19
+key_key.toggle:34
+key_waila.keybind.wailaconfig:82
+key_waila.keybind.wailadisplay:79
+key_waila.keybind.liquid:80
+key_waila.keybind.recipe:81
+key_waila.keybind.usage:75
+key_Baubles Inventory:48
+key_Change Wand Focus:33
+key_Activate Hover Harness:35
+key_Misc Wand Toggle:34
+key_Glider Toggle:34
+key_Sound Locator:38
+key_Night Vision:25
+key_Goggles of Revealing:19
+key_Step Assist:0
+key_Speed:0
+key_Jump:0
+key_Yeta Wrench Mode:21
+key_Toggle Electromagnet:0
+soundCategory_master:0.0
+soundCategory_music:0.0
+soundCategory_record:1.0
+soundCategory_weather:0.0
+soundCategory_block:1.0
+soundCategory_hostile:1.0
+soundCategory_neutral:1.0
+soundCategory_player:1.0
+soundCategory_ambient:1.0
@@ -389,6 +389,75 @@
    </recipe>
  </recipeGroup>

+  <recipeGroup name="Endergy" >
+    <recipe name="Crude Steel" energyCost="5000" >
+      <input>
+        <itemStack oreDictionary="gravel" />
+        <itemStack oreDictionary="itemClay" />
+		<itemStack oreDictionary="cobblestone" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotCrudeSteel" number="1" exp="0.1" />
+      </output>
+    </recipe>
+    <recipe name="Crystalline Alloy" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="ingotGold" />
+        <itemStack oreDictionary="itemPulsatingPowder" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotCrystallineAlloy" number="1" exp="0.5" />
+      </output>
+    </recipe>
+    <recipe name="Melodic Alloy" energyCost="20000" >
+      <input>
+        <itemStack oreDictionary="ingotEndSteel" />
+        <itemStack oreDictionary="pearlEnderEye" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotMelodicAlloy" number="1" exp="1" />
+      </output>
+    </recipe>
+    <recipe name="Stellar Alloy" energyCost="20000" >
+      <input>
+        <itemStack oreDictionary="itemNetherStar" />
+        <itemStack oreDictionary="ingotMelodicAlloy" />
+		<itemStack oreDictionary="itemClay" number="4" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotStellarAlloy" number="2" />
+      </output>
+    </recipe>
+    <recipe name="Crystalline Pink Slime" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="slimeballPink" number="2" />
+        <itemStack oreDictionary="itemPulsatingPowder" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotCrystallinePinkSlime" />
+      </output>
+    </recipe>
+    <recipe name="Energetic Silver" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="ingotSilver" />
+        <itemStack oreDictionary="dustRedstone" />
+        <itemStack oreDictionary="dustGlowstone" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotEnergeticSilver" number="1" />
+      </output>
+    </recipe>
+    <recipe name="Vivid Alloy" energyCost="10000" >
+      <input>
+        <itemStack oreDictionary="ingotEnergeticSilver" number="1" />
+        <itemStack oreDictionary="pearlEnder" number="1" />
+      </input>
+      <output>
+        <itemStack oreDictionary="ingotVividAlloy" number="1" />
+      </output>
+    </recipe>
+  </recipeGroup>
+  
  <vanillaFurnaceRecipes enabled="true" />

 </AlloySmelterRecipes>
@@ -3035,6 +3035,36 @@
 	<grindingBall id="EndSteelBall" grindingMultiplier="1.4" chanceMultiplier="2.4" powerMultiplier="0.7" durationRF="75000" >
      <itemStack modID="EnderIO" itemName="itemGrindingBall" itemMeta="8" />
 	</grindingBall>
+	
+	<!-- Endergy Balls	!-->
+	
+	<grindingBall id="CrudeSteelBall" grindingMultiplier="1.2" chanceMultiplier="1.25" powerMultiplier="0.85" durationRF="24000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="0" />
+	</grindingBall>
+	
+	<grindingBall id="CrystallineAlloyBall" grindingMultiplier="1.8" chanceMultiplier="1.4" powerMultiplier="1.45" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="1" />
+	</grindingBall>
+	
+	<grindingBall id="MelodicAlloyBall" grindingMultiplier="2.0" chanceMultiplier="1.45" powerMultiplier="1.55" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="2" />
+	</grindingBall>
+	
+	<grindingBall id="StellarAlloyBall" grindingMultiplier="2.3" chanceMultiplier="2.25" powerMultiplier="2.2" durationRF="160000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="3" />
+	</grindingBall>
+	
+	<grindingBall id="CrystallinePinkSlimeBall" grindingMultiplier="1.75" chanceMultiplier="1.55" powerMultiplier="1.55" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="4" />
+	</grindingBall>
+	
+	<grindingBall id="EnergeticSilverBall" grindingMultiplier="1.6" chanceMultiplier="1.1" powerMultiplier="1.1" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="5" />
+	</grindingBall>
+	
+	<grindingBall id="VividAlloyBall" grindingMultiplier="1.75" chanceMultiplier="1.35" powerMultiplier="1.35" durationRF="80000" >
+      <itemStack modID="EnderIO" itemName="itemGrindingBallEndergy" itemMeta="6" />
+	</grindingBall>

    <excludes>
      <itemStack modID="minecraft" itemName="glowstone" />
@@ -87,6 +87,19 @@
      <output>
        <itemStack modID="EnderIO" itemName="itemFrankenSkull" itemMeta="6" />
      </output>
+    </recipe>
+		<recipe name="Totemic Capacitor" energyCost="20000" >
+      <input>
+        <itemStack oreDictionary="ingotSoularium" slot="0" />
+        <itemStack modID="minecraft" itemName="golden_apple" itemMeta="1" slot="1" />
+        <itemStack oreDictionary="ingotSoularium" slot="2" />
+        <itemStack oreDictionary="itemVibrantPowder" slot="3" />
+        <itemStack oreDictionary="capacitorCrystalline" slot="4" />
+        <itemStack oreDictionary="itemVibrantPowder" slot="5" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="itemBasicCapacitor" itemMeta="6" />
+      </output>
    </recipe>
  </recipeGroup>

@@ -33,6 +33,19 @@ enderio.itemPowerConduit.name=Energy Conduit
 enderio.itemPowerConduitEnhanced.name=Enhanced Energy Conduit
 enderio.itemPowerConduitEnder.name=Ender Energy Conduit

+enderio.itemPowerConduitEndergyCrude.name=Clay Compound Energy Conduit
+enderio.itemPowerConduitEndergyIron.name=Iron Energy Conduit
+enderio.itemPowerConduitEndergyAluminum.name=Aluminum Energy Conduit
+enderio.itemPowerConduitEndergyGold.name=Gold Energy Conduit
+enderio.itemPowerConduitEndergyCopper.name=Copper Energy Conduit
+enderio.itemPowerConduitEndergySilver.name=Silver Energy Conduit
+enderio.itemPowerConduitEndergyElectrum.name=Electrum Energy Conduit
+enderio.itemPowerConduitEndergyEnergeticSilver.name=Energetic Silver Energy Conduit
+enderio.itemPowerConduitEndergyCrystalline.name=Crystalline Energy Conduit
+enderio.itemPowerConduitEndergyCrystallinePinkSlime.name=Crystalline Pink Slime Energy Conduit
+enderio.itemPowerConduitEndergyMelodic.name=Melodic Energy Conduit
+enderio.itemPowerConduitEndergyStellar.name=Stellar Energy Conduit
+
 enderio.itemRedstoneConduit.name=Redstone Conduit
 enderio.itemRedstoneConduitSwitch.name=Conduit Switch
 enderio.itemRedstoneConduitInsulated.name=Insulated Redstone Conduit
@@ -58,8 +71,9 @@ enderio.itemItemConduit.name=Item Conduit

 enderio.filterUpgradeBasic.name=Basic Item Filter
 enderio.filterUpgradeAdvanced.name=Advanced Item Filter
+enderio.filterUpgradeBig.name=Big Item Filter
+enderio.filterUpgradeBigAdvanced.name=Big Advanced Item Filter
 enderio.itemConduitFilterUpgrade=Upgrade for item conduits
-
 enderio.itemConduitFilterUpgrade.configured=Configured
 enderio.itemConduitFilterUpgrade.clearConfigMethod=Place in crafting grid to clear
 enderio.itemConduitFilterUpgrade.clearConfigWarning=This will clear all stored filter settings!
@@ -207,6 +221,7 @@ enderio.vibrantCrystal.name=Vibrant Crystal
 enderio.enderCrystal.name=Ender Crystal
 enderio.attractorCrystal.name=Enticing Crystal
 enderio.weatherCrystal.name=Weather Crystal
+
 enderio.darkGrindingBall.name=Dark Steel Ball
 enderio.electricalGrindingBall.name=Electrical Steel Ball
 enderio.energeticGrindingBall.name=Energetic Alloy Ball
@@ -216,6 +231,7 @@ enderio.conductiveGrindingBall.name=Conductive Iron Ball
 enderio.pulsatingGrindingBall.name=Pulsating Iron Ball
 enderio.soulariumGrindingBall.name=Soularium Ball
 enderio.endSteelGrindingBall.name=End Steel Ball
+
 enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball
 enderio.darkGrindingBall.tooltip.detailed.line2=Main Output
 enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output
@@ -250,6 +266,23 @@ enderio.darkSteel.name=Dark Steel
 enderio.soularium.name=Soularium
 enderio.endSteel.name=End Steel
 enderio.endSteelNugget.name=End Steel Nugget
+
+enderio.crudeSteel.name=Clay Compound
+enderio.crystallineAlloy.name=Crystalline Alloy
+enderio.melodicAlloy.name=Melodic Alloy
+enderio.stellarAlloy.name=Stellar Alloy
+enderio.crystallinePinkSlime.name=Crystalline Pink Slime
+enderio.energeticSilver.name=Energetic Silver
+enderio.vividAlloy.name=Vivid Alloy
+
+enderio.crudeSteelGrindingBall.name=Clay Compound Grinding Ball
+enderio.crystallineAlloyGrindingBall.name=Crystalline Alloy Grinding Ball
+enderio.melodicAlloyGrindingBall.name=Melodic Alloy Grinding Ball
+enderio.stellarAlloyGrindingBall.name=Stellar Alloy Grinding Ball
+enderio.crystallinePinkSlimeGrindingBall.name=Crystalline Pink Slime Grinding Ball
+enderio.energeticSilverGrindingBall.name=Energetic Silver Grinding Ball
+enderio.vividAlloyGrindingBall.name=Vivid Alloy Grinding Ball
+
 enderio.precientCrystal.name=Precient Crystal
 enderio.pulsatingPowder.name=Grains of Piezallity
 enderio.vibrantPowder.name=Grains of Vibrancy
@@ -280,6 +313,14 @@ tile.enderio.darkSteel.name=Dark Steel Block
 tile.enderio.soularium.name=Soularium Block
 tile.enderio.endSteel.name=End Steel Block

+tile.enderio.crudeSteel.name=Clay Compound Block
+tile.enderio.crystallineAlloy.name=Crystalline Alloy Block
+tile.enderio.melodicAlloy.name=Melodic Alloy Block
+tile.enderio.stellarAlloy.name=Stellar Alloy Block
+tile.enderio.crystallinePinkSlime.name=Crystalline Pink Slime Block
+tile.enderio.energeticSilver.name=Energetic Silver Block
+tile.enderio.vividAlloy.name=Vivid Alloy Block
+
 //Powder / Ingot
 enderio.powderCoal.name=Coal Powder
 enderio.powderIron.name=Iron Powder
@@ -295,7 +336,13 @@ enderio.itemBasicCapacitor.name=Capacitor
 enderio.basicCapacitor.name=Basic Capacitor
 enderio.activatedCapacitor.name=Double-Layer Capacitor
 enderio.enderCapacitor.name=Octadic Capacitor
+enderio.crystallineCapacitor.name=Crystalline Capacitor
 enderio.melodicCapacitor.name=Melodic Capacitor
+enderio.stellarCapacitor.name=Stellar Capacitor
+enderio.silverCapacitor.name=Silver Capacitor
+enderio.endergeticCapacitor.name=Endergetic Capacitor
+enderio.endergisedCapacitor.name=Endergised Capacitor
+enderio.totemicCapacitor.name=Totemic Capacitor

 enderio.machine.tooltip.upgrade=Machine Upgrade
 enderio.machine.tooltip.upgrade.tooltip.detailed.line1=Increases energy storage and
@@ -775,6 +822,15 @@ item.endSteel_sword.name=The Ender MKII
 item.endSteel_pickaxe.name=End Steel Pick
 item.endSteel_axe.name=End Steel Axe

+//Stellar
+item.stellar_helmet.name=Stellar Helm
+item.stellar_chestplate.name=Stellar Plate
+item.stellar_leggings.name=Stellar Leggings
+item.stellar_boots.name=Stellar Boots
+item.stellar_sword.name=The Ender MKIV
+item.stellar_pickaxe.name=Stellar Pick
+item.stellar_axe.name=Stellar Axe
+
 enderio.item.darkSteel.tooltip.lvs=lvs

 enderio.item.darkSteel_pickaxe.tooltip.effPowered=Efficiency when powered
@@ -785,9 +841,13 @@ enderio.item.endSteel_pickaxe.tooltip.effPowered=Efficiency when powered
 enderio.item.endSteel_pickaxe.tooltip.effObs=Efficiency breaking obsidian
 enderio.item.endSteel_pickaxe.tooltip.cost=cost

+enderio.item.stellar_pickaxe.tooltip.effPowered=Efficiency when powered
+enderio.item.stellar_pickaxe.tooltip.effObs=Efficiency breaking obsidian
+enderio.item.stellar_pickaxe.tooltip.cost=cost
+
 enderio.item.darkSteel_axe.tooltip.multiHarvest=Sneak to harvest multiple logs
 enderio.item.endSteel_axe.tooltip.multiHarvest=Sneak to harvest multiple logs
-
+enderio.item.stellar_axe.tooltip.multiHarvest=Sneak to harvest multiple logs

 enderio.item.darkSteel_shears.tooltip.multiHarvest=Shears multiple blocks/sheep when empowered

@@ -799,18 +859,28 @@ enderio.item.endSteel_sword.tooltip.line1=Increased skull and ender pearl drops
 enderio.item.endSteel_sword.tooltip.line2=Endermen can't teleport once hit
 enderio.item.endSteel_sword.tooltip.line3=+2 Damage when Powered

+enderio.item.stellar_sword.tooltip.line1=Increased skull and ender pearl drops
+enderio.item.stellar_sword.tooltip.line2=Endermen can't teleport once hit
+enderio.item.stellar_sword.tooltip.line3=+2 Damage when Powered
+
 enderio.item.darkSteel_armor.tooltip.line1=Diamond level protection
 enderio.item.darkSteel_armor.tooltip.line2=when powered

 enderio.item.endSteel_armor.tooltip.line1=Diamond+ level protection
 enderio.item.endSteel_armor.tooltip.line2=when powered

+enderio.item.stellar_armor.tooltip.line1=Diamond+ level protection
+enderio.item.stellar_armor.tooltip.line2=when powered
+
 enderio.item.darkSteel_boots.tooltip.line1=Fall damage negated
 enderio.item.darkSteel_boots.tooltip.line2=when powered

 enderio.item.endSteel_boots.tooltip.line1=Fall damage negated
 enderio.item.endSteel_boots.tooltip.line2=when powered

+enderio.item.stellar_boots.tooltip.line1=Fall damage negated
+enderio.item.stellar_boots.tooltip.line2=when powered
+
 enderio.darksteel.upgrade.empowered_one.name=Empowered
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=Power: $P
 enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=$D% damage absorbed
@@ -0,0 +1,23 @@
+{
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 500
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		},
+  		{
+  			"index": 1,
+  			"time": 20
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		}
+  	]
+  }  
+}
@@ -0,0 +1,23 @@
+{
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 500
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		},
+  		{
+  			"index": 1,
+  			"time": 20
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		}
+  	]
+  }  
+}
@@ -0,0 +1,23 @@
+{
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 500
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		},
+  		{
+  			"index": 1,
+  			"time": 20
+  		},
+  		{
+  			"index": 0,
+  			"time": 100
+  		}
+  	]
+  }  
+}
@@ -0,0 +1,10 @@
+{
+  "animation": {
+    "frames": [
+      {"index":0, "time":140},
+      {"index":1, "time":2},
+      {"index":0, "time":155},
+      {"index":1, "time":3}
+    ]
+  }
+}
@@ -49,6 +49,7 @@ import crazypants.enderio.conduit.oc.OCConduitRenderer;
 import crazypants.enderio.conduit.oc.OCUtil;
 import crazypants.enderio.conduit.power.PowerConduit;
 import crazypants.enderio.conduit.power.PowerConduitRenderer;
+import crazypants.enderio.conduit.power.endergy.PowerConduitEndergy;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduitRenderer;
 import crazypants.enderio.conduit.redstone.RedstoneConduit;
@@ -208,6 +209,7 @@ public class ClientProxy extends CommonProxy {
    InsulatedRedstoneConduit.initIcons();
    RedstoneSwitch.initIcons();
    PowerConduit.initIcons();
+    PowerConduitEndergy.initIcons();
    LiquidConduit.initIcons();
    AdvancedLiquidConduit.initIcons();
    EnderLiquidConduit.initIcons();
@@ -335,6 +337,7 @@ public class ClientProxy extends CommonProxy {
    ItemConduitRenderer itemConRenderer = new ItemConduitRenderer();
    MinecraftForgeClient.registerItemRenderer(EnderIO.itemLiquidConduit, itemConRenderer);
    MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduit, itemConRenderer);
+    MinecraftForgeClient.registerItemRenderer(EnderIO.itemPowerConduitEndergy, itemConRenderer);
    MinecraftForgeClient.registerItemRenderer(EnderIO.itemRedstoneConduit, itemConRenderer);
    MinecraftForgeClient.registerItemRenderer(EnderIO.itemItemConduit, itemConRenderer);
    MinecraftForgeClient.registerItemRenderer(EnderIO.itemGasConduit, itemConRenderer);
@@ -56,6 +56,7 @@ import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
 import crazypants.enderio.conduit.me.ItemMEConduit;
 import crazypants.enderio.conduit.oc.ItemOCConduit;
 import crazypants.enderio.conduit.power.ItemPowerConduit;
+import crazypants.enderio.conduit.power.endergy.ItemPowerConduitEndergy;
 import crazypants.enderio.conduit.redstone.ConduitBundledRedstoneProvider;
 import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
 import crazypants.enderio.conduit.redstone.ItemRedstoneConduit;
@@ -152,6 +153,9 @@ import crazypants.enderio.material.ItemMaterial;
 import crazypants.enderio.material.ItemPowderIngot;
 import crazypants.enderio.material.MaterialRecipes;
 import crazypants.enderio.material.OreDictionaryPreferences;
+import crazypants.enderio.material.endergy.BlockIngotStorageEndergy;
+import crazypants.enderio.material.endergy.ItemAlloyEndergy;
+import crazypants.enderio.material.endergy.ItemGrindingBallEndergy;
 import crazypants.enderio.network.PacketHandler;
 import crazypants.enderio.rail.BlockEnderRail;
 import crazypants.enderio.teleport.ItemTravelStaff;
@@ -195,13 +199,16 @@ public class EnderIO {
  // Materials
  public static ItemCapacitor itemBasicCapacitor;
  public static ItemAlloy itemAlloy;
-  public static ItemAlloy itemGrindingBall;
+  public static ItemGrindingBall itemGrindingBall;
+  public static ItemAlloyEndergy itemAlloyEndergy;
+  public static ItemGrindingBallEndergy itemGrindingBallEndergy;
  public static BlockFusedQuartz blockFusedQuartz;
  public static ItemFusedQuartzFrame itemFusedQuartzFrame;
  public static ItemMachinePart itemMachinePart;
  public static ItemPowderIngot itemPowderIngot;
  public static ItemMaterial itemMaterial;
  public static BlockIngotStorage blockIngotStorage;
+  public static BlockIngotStorageEndergy blockIngotStorageEndergy;
  public static BlockDarkSteelBars blockDarkIronBars;
  public static BlockSoulariumBars blockSoulariumBars;
  public static BlockEndSteelBars blockEndSteelBars;
@@ -234,6 +241,7 @@ public class EnderIO {
  public static ItemConduitFacade itemConduitFacade;
  public static ItemRedstoneConduit itemRedstoneConduit;
  public static ItemPowerConduit itemPowerConduit;
+  public static ItemPowerConduitEndergy itemPowerConduitEndergy;
  public static ItemLiquidConduit itemLiquidConduit;
  public static ItemItemConduit itemItemConduit;
  public static ItemGasConduit itemGasConduit;
@@ -437,6 +445,7 @@ public class EnderIO {

    itemRedstoneConduit = ItemRedstoneConduit.create();
    itemPowerConduit = ItemPowerConduit.create();
+    itemPowerConduitEndergy = ItemPowerConduitEndergy.create();
    itemLiquidConduit = ItemLiquidConduit.create();
    itemItemConduit = ItemItemConduit.create();
    itemGasConduit = ItemGasConduit.create();
@@ -444,7 +453,7 @@ public class EnderIO {
    itemOCConduit = ItemOCConduit.create();

    itemBasicFilterUpgrade = ItemBasicItemFilter.create();
- // itemBigFilterUpgrade = ItemBigItemFilter.create();
+    itemBigFilterUpgrade = ItemBigItemFilter.create();
    itemExistingItemFilter = ItemExistingItemFilter.create();
    itemModItemFilter = ItemModItemFilter.create();
    itemPowerItemFilter = ItemPowerItemFilter.create();
@@ -456,6 +465,8 @@ public class EnderIO {
    itemMaterial = ItemMaterial.create();
    itemAlloy = ItemAlloy.create();
    itemGrindingBall = ItemGrindingBall.create();
+    itemAlloyEndergy = ItemAlloyEndergy.create();
+    itemGrindingBallEndergy = ItemGrindingBallEndergy.create();
    itemPowderIngot = ItemPowderIngot.create();

    registerFluids();
@@ -470,6 +481,7 @@ public class EnderIO {
    itemSoulVessel = ItemSoulVessel.create();

    blockIngotStorage = BlockIngotStorage.create();
+    blockIngotStorageEndergy = BlockIngotStorageEndergy.create();

    blockDarkIronBars = BlockDarkSteelBars.create();
    blockSoulariumBars = BlockSoulariumBars.create();
@@ -24,6 +24,7 @@ public enum ModObject {

  // Power
  itemPowerConduit,
+  itemPowerConduitEndergy,

  // Liquid
  itemLiquidConduit,
@@ -31,7 +32,9 @@ public enum ModObject {
  // Materials
  itemBasicCapacitor,
  itemAlloy,
+  itemAlloyEndergy,
  itemGrindingBall,
+  itemGrindingBallEndergy,
  itemMaterial,
  itemMachinePart,
  itemPowderIngot,
@@ -88,6 +91,7 @@ public enum ModObject {
  blockDarkSteelLadder,
  blockReinforcedObsidian,
  blockIngotStorage,
+  blockIngotStorageEndergy,

  // Painter
  blockPainter,
@@ -4,6 +4,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import appeng.api.AEApi;
 import cpw.mods.fml.common.Optional.Method;
@@ -20,8 +21,10 @@ import crazypants.enderio.machine.MachineRecipeRegistry;
 import crazypants.enderio.material.BlockFusedQuartz;
 import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.Material;
+
 import static crazypants.enderio.ModObject.blockPainter;
 import static crazypants.enderio.material.Alloy.*;
+import static crazypants.enderio.material.endergy.AlloyEndergy.*;
 import static crazypants.enderio.material.Material.*;
 import static crazypants.util.RecipeUtil.addShaped;

@@ -35,6 +38,13 @@ public class ConduitRecipes {
    ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0);
    ItemStack fusedGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal());

+    String crudeSteel = CRUDE_STEEL.getOreIngot();
+    String energeticSilver = ENERGETIC_SILVER.getOreIngot();
+    String crystallineAlloy = CRYSTALLINE_ALLOY.getOreIngot();
+    String crystallinePinkSlime = CRYSTALLINE_PINK_SLIME.getOreIngot();
+    String melodicAlloy = MELODIC_ALLOY.getOreIngot();
+    String stellarAlloy = STELLAR_ALLOY.getOreIngot();
+
    String electricalSteel = ELECTRICAL_STEEL.getOreIngot();
    String phasedGold = PHASED_GOLD.getOreIngot();
    String conductiveIron = CONDUCTIVE_IRON.getOreIngot();
@@ -45,6 +55,7 @@ public class ConduitRecipes {
    String binder = CONDUIT_BINDER.oreDict;

    ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal());
+    ItemStack skeletalContractor = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.SKELETAL_CONTRACTOR.ordinal());

    //Recipes
    addShaped(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', binder);
@@ -55,13 +66,92 @@ public class ConduitRecipes {
    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', fusedGlass);
    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', fusedQuartz);
    addShaped(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 2), "bbb", "#p#", "bbb", 'b', binder, '#', fusedQuartz, 'p', phasedGold);
-    addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', conductiveIron);
-    addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', energeticGold);
-    addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', phasedGold);
    addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 0), "###", '#', redstoneAlloy);
    addShaped(new ItemStack(EnderIO.itemRedstoneConduit, 1, 1), "lbl", "bcb", "lbl", 'b', binder, 'c', redstoneConduit, 'l', Blocks.lever);
    addShaped(new ItemStack(EnderIO.itemRedstoneConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', redstoneAlloy);

+    if(Config.useHardRecipes) {
+
+    	ItemStack lastTier;
+
+		addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', crudeSteel);
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 0);
+
+		addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotIron");
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 1);
+
+        if(OreDictionary.doesOreNameExist("ingotAluminum")||OreDictionary.doesOreNameExist("ingotAluminium")) {
+        	addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotAluminum");
+        	addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotAluminium");
+        	lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 2);
+        }
+
+    	addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotGold");
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 3);
+
+		if(OreDictionary.doesOreNameExist("ingotCopper") && OreDictionary.getOres("ingotCopper").size()>0) {
+			addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotCopper");
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 4);
+		}
+
+        addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', conductiveIron);
+			lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 0);
+
+		if(OreDictionary.doesOreNameExist("ingotSilver")) {
+			addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotSilver");
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 5);
+		}
+
+		if(OreDictionary.doesOreNameExist("ingotElectrum")) {
+			addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotElectrum");
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 6);
+		}
+
+        addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticGold);
+			lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 1);
+
+		if(OreDictionary.doesOreNameExist("ingotSilver")) {
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticSilver);
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 7);
+		}
+
+        addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', phasedGold);
+			lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 2);
+
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallineAlloy);
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 8);
+
+		if(OreDictionary.doesOreNameExist("slimeballPink")) {
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallinePinkSlime);
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 9);
+		}
+
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', melodicAlloy);
+			lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 10);
+
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', stellarAlloy);
+
+    }
+
+    else {
+        addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', conductiveIron);
+        addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', energeticGold);
+        addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', phasedGold);
+
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', crudeSteel);
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', "ingotIron");
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', "ingotAluminum");
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), "bbb", "###", "bbb", 'b', binder, '#', "ingotGold");
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "bbb", "###", "bbb", 'b', binder, '#', "ingotCopper");
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "bbb", "###", "bbb", 'b', binder, '#', "ingotSilver");
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "bbb", "###", "bbb", 'b', binder, '#', "ingotElectrum");
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "bbb", "###", "bbb", 'b', binder, '#', energeticSilver);
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "bbb", "###", "bbb", 'b', binder, '#', crystallineAlloy);
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "bbb", "###", "bbb", 'b', binder, '#', crystallinePinkSlime);
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "bbb", "###", "bbb", 'b', binder, '#', melodicAlloy);
+        addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "bbb", "###", "bbb", 'b', binder, '#', stellarAlloy);
+
+    }
    if (GasUtil.isGasConduitEnabled()) {
      addShaped(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', binder, '#', electricalSteel, 'g', fusedGlass);
    }
@@ -78,6 +168,12 @@ public class ConduitRecipes {
    ItemStack advFilter = new ItemStack(EnderIO.itemBasicFilterUpgrade, 1, 1);
    addShaped(advFilter, "rpr", "pzp", "rpr", 'p', Items.paper, 'z', zombieController, 'r', "dustRedstone");

+    ItemStack bigFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 0);
+    addShaped(bigFilter, "opo", "psp", "opo", 'p', Items.paper, 's', skeletalContractor, 'o', "dustObsidian");
+
+    ItemStack bigAdvFilter = new ItemStack(EnderIO.itemBigFilterUpgrade, 1, 1);
+    addShaped(bigAdvFilter, "eme", "mfm", "eme", 'm', melodicAlloy, 'f', bigFilter, 'e', END_STEEL.getOreIngot());
+
    ItemStack modFilter = new ItemStack(EnderIO.itemModItemFilter, 1, 0);
    addShaped(modFilter, " p ", "pwp", " p ", 'p', Items.paper, 'w', EnderIO.itemYetaWench);

@@ -66,8 +66,8 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
      slotLocations.add(new Point(x, y));
      bgSlots.add(new GhostBackgroundItemSlot(EnderIO.itemBasicFilterUpgrade, slotInputFilterUpgrades));

-      x = 28;
-      y = 47;
+      x = 10;
+      y = 83;
      slotSpeedUpgrades = addSlotToContainer(new Slot(getInv(), 0, x, y) {
        @Override
        public boolean isItemValid(ItemStack par1ItemStack) {
@@ -108,7 +108,7 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
  public Point getPlayerInventoryOffset() {
    return new Point(23, 113);
  }
-  
+
  public void addFilterListener(FilterChangeListener list) {
    filterListeners.add(list);
  }
@@ -279,7 +279,7 @@ public class ExternalConnectionContainer extends ContainerEnder<InventoryUpgrade
    public boolean isItemValid(ItemStack par1ItemStack) {
      return inventory.isItemValidForSlot(getSlotIndex(), par1ItemStack);
    }
-    
+
  }

 }
@@ -0,0 +1,197 @@
+package crazypants.enderio.conduit.gui.item;
+
+import net.minecraft.client.gui.GuiButton;
+
+import org.lwjgl.opengl.GL11;
+
+import com.enderio.core.client.gui.GuiContainerBase;
+import com.enderio.core.client.gui.button.CycleButton;
+import com.enderio.core.client.gui.button.IconButton;
+import com.enderio.core.client.gui.button.ToggleButton;
+
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.conduit.gui.GuiExternalConnection;
+import crazypants.enderio.conduit.item.filter.FuzzyMode;
+import crazypants.enderio.conduit.item.filter.ItemFilter;
+import crazypants.enderio.gui.GuiContainerBaseEIO;
+import crazypants.enderio.gui.IconEIO;
+
+public class BigItemFilterGui implements IItemFilterGui {
+
+  private static final int ID_WHITELIST = GuiExternalConnection.nextButtonId();
+  private static final int ID_NBT = GuiExternalConnection.nextButtonId();
+  private static final int ID_META = GuiExternalConnection.nextButtonId();
+  private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId();
+  private static final int ID_STICKY = GuiExternalConnection.nextButtonId();
+  private static final int ID_FUZZY = GuiExternalConnection.nextButtonId();
+
+  private final GuiContainerBaseEIO gui;
+
+  private final ToggleButton useMetaB;
+  private final ToggleButton useNbtB;
+  private final IconButton whiteListB;
+  private final ToggleButton useOreDictB;
+  private final ToggleButton stickyB;
+  private final CycleButton<FuzzyMode> fuzzyB;
+
+  final boolean isAdvanced;
+  final boolean isStickyModeAvailable;
+
+  private final IItemFilterContainer filterContainer;
+  private final ItemFilter filter;
+
+  private int buttonIdOffset;
+  private int xOffset;
+  private int yOffset;
+
+  public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable) {
+    this(gui, filterContainer, isStickyModeAvailable, 32, 48, 0);
+  }
+
+  public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable,
+      int xOffset, int yOffset,
+      int buttonIdOffset) {
+    this.gui = gui;
+    this.isStickyModeAvailable = isStickyModeAvailable;
+    this.filterContainer = filterContainer;
+    this.xOffset = xOffset;
+    this.yOffset = yOffset;
+    this.buttonIdOffset = buttonIdOffset;
+
+    filter = filterContainer.getItemFilter();
+
+    isAdvanced = filter.isAdvanced();
+
+    int butLeft = xOffset + 92+ 54;
+    int x = butLeft;
+    int y = yOffset + 40;
+    whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
+    whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
+
+    y -= 20;
+    useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
+    useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData"));
+    useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData"));
+    useMetaB.setPaintSelectedBorder(false);
+
+    stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY);
+    stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"));
+    stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled"));
+    stickyB.setPaintSelectedBorder(false);
+
+    y -= 20;
+    useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT);
+    useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled"));
+    useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled"));
+    useOreDictB.setPaintSelectedBorder(false);
+
+    y -= 20;
+    useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT);
+    useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT"));
+    useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT"));
+    useNbtB.setPaintSelectedBorder(false);
+
+    y -= 20;
+    fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+  }
+
+  public void createFilterSlots() {
+    filter.createGhostSlots(gui.getGhostSlots(), xOffset+1, yOffset+1, new Runnable() {
+      @Override
+      public void run() {
+        sendFilterChange();
+      }
+    });
+  }
+
+  @Override
+  public void mouseClicked(int x, int y, int par3) {
+  }
+
+  @Override
+  public void updateButtons() {
+    ItemFilter activeFilter = filter;
+
+    if(isAdvanced) {
+      useNbtB.onGuiInit();
+      useNbtB.setSelected(activeFilter.isMatchNBT());
+
+      useOreDictB.onGuiInit();
+      useOreDictB.setSelected(activeFilter.isUseOreDict());
+
+      if(isStickyModeAvailable) {
+        stickyB.onGuiInit();
+        stickyB.setSelected(activeFilter.isSticky());
+      }
+
+      fuzzyB.onGuiInit();
+      fuzzyB.setMode(activeFilter.getFuzzyMode());
+    }
+
+    useMetaB.onGuiInit();
+    useMetaB.setSelected(activeFilter.isMatchMeta());
+
+    whiteListB.onGuiInit();
+    if(activeFilter.isBlacklist()) {
+      whiteListB.setIcon(IconEIO.FILTER_BLACKLIST);
+      whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist"));
+    } else {
+      whiteListB.setIcon(IconEIO.FILTER_WHITELIST);
+      whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
+    }
+  }
+
+
+  @Override
+  public void actionPerformed(GuiButton guiButton) {
+
+    if(guiButton.id == ID_META + buttonIdOffset) {
+      filter.setMatchMeta(useMetaB.isSelected());
+      sendFilterChange();
+    } else if(guiButton.id == ID_NBT + buttonIdOffset) {
+      filter.setMatchNBT(useNbtB.isSelected());
+      sendFilterChange();
+    } else if(guiButton.id == ID_STICKY + buttonIdOffset) {
+      filter.setSticky(stickyB.isSelected());
+      sendFilterChange();
+    } else if(guiButton.id == ID_ORE_DICT + buttonIdOffset) {
+      filter.setUseOreDict(useOreDictB.isSelected());
+      sendFilterChange();
+    } else if(guiButton.id == ID_FUZZY + buttonIdOffset) {
+      filter.setFuzzyMode(fuzzyB.getMode());
+      sendFilterChange();
+    } else if(guiButton.id == ID_WHITELIST + buttonIdOffset) {
+      filter.setBlacklist(!filter.isBlacklist());
+      sendFilterChange();
+    }
+  }
+
+  private void sendFilterChange() {
+    updateButtons();
+    filterContainer.onFilterChanged();
+  }
+
+  @Override
+  public void deactivate() {
+    useNbtB.detach();
+    useMetaB.detach();
+    useOreDictB.detach();
+    whiteListB.detach();
+    stickyB.detach();
+    fuzzyB.detach();
+  }
+
+  @Override
+  public void renderCustomOptions(int top, float par1, int par2, int par3) {
+    GL11.glColor3f(1, 1, 1);
+    gui.bindGuiTexture(1);
+
+    gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18);
+    gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18);
+    gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
+    gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
+    gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 40, 0, 238, 18 * 5, 18);
+    gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 40, 0, 238, 18 * 5, 18);
+  }
+
+}
@@ -69,7 +69,7 @@ public class ItemSettings extends BaseSettingsPanel {

  private final RedstoneModeButton rsB;
  private final ColorButton colorB;
-  
+
  private ColorButton channelB;

  boolean inOutShowIn = false;
@@ -98,18 +98,18 @@ public class ItemSettings extends BaseSettingsPanel {

    nextFilterB = MultiIconButton.createRightArrowButton(gui, NEXT_FILTER_ID, x, y);

-    x = 66;    
+    x = 66;
    channelB = new ColorButton(gui, ID_CHANNEL, x, y);
    channelB.setColorIndex(0);
    channelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel"));
-    
+
    filterUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18 * 2, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.filterupgrade")) {
      @Override
      public boolean shouldDraw() {
        return !gui.getContainer().hasFilterUpgrades(isInputVisible()) && super.shouldDraw();
      }
    };
-    speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) {
+    speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18*2, customTop + 3 + 16 + 36, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) {
      @Override
      public boolean shouldDraw() {
        return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw();
@@ -130,7 +130,7 @@ public class ItemSettings extends BaseSettingsPanel {

    x += channelB.getWidth() + 4;
    priLeft = x - 8;
-    
+
    rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() {

      @Override
@@ -167,8 +167,8 @@ public class ItemSettings extends BaseSettingsPanel {
    loopB.setPaintSelectedBorder(false);

    priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), EnderIO.lang.localize("gui.conduit.item.priority"));
-    
-    x = priLeft + priWidth + 9;    
+
+    x = priLeft + priWidth + 9;
    priUpB = MultiIconButton.createAddButton(gui, ID_PRIORITY_UP, x, y);
    priDownB = MultiIconButton.createMinusButton(gui, ID_PRIORITY_DOWN, x, y+8);

@@ -212,7 +212,7 @@ public class ItemSettings extends BaseSettingsPanel {

    ConnectionMode mode = con.getConnectionMode(gui.getDir());
    if(mode == ConnectionMode.INPUT) {
-      showInput = true;     
+      showInput = true;
    } else if(mode == ConnectionMode.OUTPUT) {
      showOutput = true;
    } else if(mode == ConnectionMode.IN_OUT) {
@@ -257,7 +257,7 @@ public class ItemSettings extends BaseSettingsPanel {
      return;
    }
    boolean outputActive = (mode == ConnectionMode.IN_OUT && !inOutShowIn) || (mode == ConnectionMode.OUTPUT);
-    
+
    if(!outputActive) {

      rsB.onGuiInit();
@@ -286,12 +286,12 @@ public class ItemSettings extends BaseSettingsPanel {
      priDownB.onGuiInit();
      gui.addToolTip(priorityTooltip);
    }
-    
+
    int chanCol;
    if(!outputActive) {
-      chanCol = itemConduit.getInputColor(gui.getDir()).ordinal();      
-    } else {      
-      chanCol = itemConduit.getOutputColor(gui.getDir()).ordinal();      
+      chanCol = itemConduit.getInputColor(gui.getDir()).ordinal();
+    } else {
+      chanCol = itemConduit.getOutputColor(gui.getDir()).ordinal();
    }
    channelB.onGuiInit();
    channelB.setColorIndex(chanCol);
@@ -324,12 +324,12 @@ public class ItemSettings extends BaseSettingsPanel {
      sendFilterChange();
    } else if(guiButton.id == ID_CHANNEL) {

-      DyeColor col = DyeColor.values()[channelB.getColorIndex()];      
+      DyeColor col = DyeColor.values()[channelB.getColorIndex()];
      if(isInputVisible()) {
        itemConduit.setInputColor(gui.getDir(), col);
      } else  {
        itemConduit.setOutputColor(gui.getDir(), col);
-      } 
+      }
      sendFilterChange();
    }

@@ -343,7 +343,7 @@ public class ItemSettings extends BaseSettingsPanel {
  }

  @Override
-  public void mouseClicked(int x, int y, int par3) {    
+  public void mouseClicked(int x, int y, int par3) {
    super.mouseClicked(x, y, par3);
    if(filterGui != null) {
      filterGui.mouseClicked(x, y, par3);
@@ -351,7 +351,7 @@ public class ItemSettings extends BaseSettingsPanel {
  }

  private boolean isInputVisible() {
-    ConnectionMode mode = con.getConnectionMode(gui.getDir());    
+    ConnectionMode mode = con.getConnectionMode(gui.getDir());
    return (mode == ConnectionMode.IN_OUT && inOutShowIn) || (mode == ConnectionMode.INPUT);
  }

@@ -388,9 +388,9 @@ public class ItemSettings extends BaseSettingsPanel {
      //draw speed upgrade slot
      GL11.glColor3f(1, 1, 1);
      gui.bindGuiTexture(1);
-      gui.drawTexturedModalRect(gui.getGuiLeft() + 9 + 18, gui.getGuiTop() + 46, 94, 238, 18, 18);      
+      gui.drawTexturedModalRect(gui.getGuiLeft() + 9, gui.getGuiTop() + 46 +18 +18, 94, 238, 18, 18);
    }
-    
+
    //filter upgrade slot
    GL11.glColor3f(1, 1, 1);
    gui.bindGuiTexture(1);
@@ -38,9 +38,9 @@ public class ItemBigItemFilter extends ItemBasicItemFilter {
 	    int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1);
 	    ItemFilter filter;
 	    if(damage == 0) {
-		      filter = new ItemFilter(30,false);
+		      filter = new ItemFilterBig(24, false);
 	    } else {
-	      filter = new ItemFilter(30,true);
+	      filter = new ItemFilterBig(24, true);
 	    }
 	    if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
 	      filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
@@ -48,6 +48,13 @@ public class ItemBigItemFilter extends ItemBasicItemFilter {
 	    return filter;
 	  }

+	  @Override
+	  @SideOnly(Side.CLIENT)
+	  public IIcon getIconFromDamage(int damage) {
+	    damage = MathHelper.clamp_int(damage, 0, 1);
+	    return icons[damage];
+	  }
+
 	  @Override
 	  @SideOnly(Side.CLIENT)
 	  public void registerIcons(IIconRegister IIconRegister) {
@@ -45,6 +45,7 @@ public class ItemFilter implements IInventory, IItemFilter {
  boolean sticky = false;
  FuzzyMode fuzzyMode = FuzzyMode.DISABLED;

+  int numItems;
  ItemStack[] items;

  final List<int[]> oreIds;
@@ -74,6 +75,7 @@ public class ItemFilter implements IInventory, IItemFilter {

  public ItemFilter(int numItems, boolean isAdvanced) {
    this.isAdvanced = isAdvanced;
+    this.numItems = numItems;
    items = new ItemStack[numItems];
    oreIds = new ArrayList<int[]>(numItems);
    for(int i=0;i<numItems;i++) {
@@ -248,6 +250,7 @@ public class ItemFilter implements IInventory, IItemFilter {
    nbtRoot.setBoolean("sticky", sticky);
    nbtRoot.setBoolean("isAdvanced", isAdvanced);
    nbtRoot.setByte("fuzzyMode", (byte) fuzzyMode.ordinal());
+    nbtRoot.setInteger("numItems", numItems);

    int i = 0;
    for (ItemStack item : items) {
@@ -279,8 +282,11 @@ public class ItemFilter implements IInventory, IItemFilter {
    sticky = nbtRoot.getBoolean("sticky");
    isAdvanced = nbtRoot.getBoolean("isAdvanced");
    fuzzyMode = FuzzyMode.values()[nbtRoot.getByte("fuzzyMode") & 255];
+    numItems = nbtRoot.getInteger("numItems");
+
+    if(numItems<10 && isAdvanced) numItems = 10;
+    else if(numItems<5 && !isAdvanced) numItems = 5;

-    int numItems = items.length;
    items = new ItemStack[numItems];
    oreIds.clear();
    for(int i=0;i<numItems;i++) {
@@ -0,0 +1,69 @@
+package crazypants.enderio.conduit.item.filter;
+
+import java.util.List;
+
+import com.enderio.core.client.gui.widget.GhostSlot;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.conduit.gui.GuiExternalConnection;
+import crazypants.enderio.conduit.gui.item.BasicItemFilterGui;
+import crazypants.enderio.conduit.gui.item.BigItemFilterGui;
+import crazypants.enderio.conduit.gui.item.IItemFilterGui;
+import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer;
+import crazypants.enderio.conduit.item.IItemConduit;
+
+public class ItemFilterBig extends ItemFilter {
+
+	public ItemFilterBig() {
+		this(24,false);
+	}
+
+  public ItemFilterBig(int numItems, boolean isAdvanced) {
+	  super(numItems, isAdvanced);
+  }
+
+  @Override
+  public String getInventoryName() {
+    return "Big Item Filter";
+  }
+
+  @Override
+  @SideOnly(Side.CLIENT)
+  public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) {
+    ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput);
+    BigItemFilterGui bigItemFilterGui = new BigItemFilterGui(gui, cont, !isInput);
+    bigItemFilterGui.createFilterSlots();
+    return bigItemFilterGui;
+  }
+
+  @Override
+  public void createGhostSlots(List<GhostSlot> slots, int xOffset, int yOffset, Runnable cb) {
+    int topY = yOffset;
+    int leftX = xOffset;
+    int index = 0;
+    int numRows = (int) Math.ceil(items.length/8);
+    for (int row = 0; row < numRows; ++row) {
+      for (int col = 0; col < 8; ++col) {
+        int x = leftX + col * 18;
+        int y = topY + row * 20;
+        slots.add(new ItemFilterGhostSlot(index, x, y, cb));
+        index++;
+      }
+    }
+  }
+
+  @Override
+  public int getSlotCount() {
+    return getSizeInventory();
+  }
+
+
+  @Override
+  public String toString() {
+//    return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + ", useOreDict=" + useOreDict + ", sticky="
+//        + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", isAdvanced=" + isAdvanced + "]";
+    return "Big"+super.toString();
+  }
+
+}
@@ -23,8 +23,6 @@ public class ItemPowerConduit extends AbstractItemConduit {
      new ItemConduitSubtype(ModObject.itemPowerConduit.name(), "enderio:itemPowerConduit"),
      new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Enhanced", "enderio:itemPowerConduitEnhanced"),
      new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Ender", "enderio:itemPowerConduitEnder"),
-  //    new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Stellar", "enderio:itemPowerConduitStellar")
-
  };

  public static ItemPowerConduit create() {
@@ -37,6 +35,10 @@ public class ItemPowerConduit extends AbstractItemConduit {
    super(ModObject.itemPowerConduit, subtypes);
  }

+  protected ItemPowerConduit(ModObject modObject, ItemConduitSubtype[] subtypes) {
+    super(modObject, subtypes);
+  }
+
  @Override
  public Class<? extends IConduit> getBaseConduitType() {
    return IPowerConduit.class;
@@ -50,7 +50,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {

  private static ICapacitor[] capacitors;

-  static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender", /*"Stellar"*/};
+  static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender"};

  static ICapacitor[] getCapacitors() {
    if(capacitors == null) {
@@ -58,7 +58,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
        new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF),
        new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF),
        new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF),
-       // new BasicCapacitor(Config.powerConduitTierFourRF, Config.powerConduitTierFourRF)
      };
    }
    return capacitors;
@@ -76,8 +75,8 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
      public void registerIcons(IIconRegister register) {
        for (String pf : POSTFIX) {
          ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf));
-          ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT + pf));
-          ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT + pf));
+          ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT));
+          ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT));
          ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf));
        }
        ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY));
@@ -503,12 +502,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {

  @Override
  public IIcon getTextureForInputMode() {
-    return ICONS.get(ICON_KEY_INPUT + POSTFIX[subtype]);
+    return ICONS.get(ICON_KEY_INPUT);
  }

  @Override
  public IIcon getTextureForOutputMode() {
-    return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[subtype]);
+    return ICONS.get(ICON_KEY_OUTPUT);
  }

  @Override
@@ -21,7 +21,7 @@ public class PowerConduitNetwork extends AbstractConduitNetwork<IPowerConduit, I

  // ----------------------------------------------------------------------

-  NetworkPowerManager powerManager;
+  public NetworkPowerManager powerManager;

  private final Map<ReceptorKey, ReceptorEntry> powerReceptors = new HashMap<ReceptorKey, ReceptorEntry>();

@@ -0,0 +1,75 @@
+package crazypants.enderio.conduit.power.endergy;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.ModObject;
+import crazypants.enderio.conduit.AbstractItemConduit;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.ItemConduitSubtype;
+import crazypants.enderio.conduit.power.IPowerConduit;
+import crazypants.enderio.conduit.power.ItemPowerConduit;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.ICapacitor;
+
+public class ItemPowerConduitEndergy extends ItemPowerConduit {
+
+  private static String PREFIX;
+  private static String POSTFIX;
+
+  static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
+	  new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crude", "enderio:itemPowerConduitCrude"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Iron", "enderio:itemPowerConduitIron"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Aluminum", "enderio:itemPowerConduitAluminum"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Gold", "enderio:itemPowerConduitGold"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Copper", "enderio:itemPowerConduitCopper"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Silver", "enderio:itemPowerConduitSilver"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Electrum", "enderio:itemPowerConduitElectrum"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "EnergeticSilver", "enderio:itemPowerConduitEnergeticSilver"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crystalline", "enderio:itemPowerConduitCrystalline"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "CrystallinePinkSlime", "enderio:itemPowerConduitCrystallinePinkSlime"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Melodic", "enderio:itemPowerConduitMelodic"),
+      new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Stellar", "enderio:itemPowerConduitStellar"),
+
+  };
+
+  public static ItemPowerConduitEndergy create() {
+    ItemPowerConduitEndergy result = new ItemPowerConduitEndergy();
+    result.init();
+    return result;
+  }
+
+  protected ItemPowerConduitEndergy() {
+    super(ModObject.itemPowerConduitEndergy, subtypes);
+  }
+
+  @Override
+  public Class<? extends IConduit> getBaseConduitType() {
+    return IPowerConduit.class;
+  }
+
+  @Override
+  public IConduit createConduit(ItemStack stack, EntityPlayer player) {
+    return new PowerConduitEndergy(stack.getItemDamage());
+  }
+
+  @Override
+  @SideOnly(Side.CLIENT)
+  public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+    if(PREFIX == null) {
+      POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
+      PREFIX = EnderIO.lang.localize("power.maxOutput") + " ";
+    }
+    ICapacitor cap = PowerConduitEndergy.getCapacitors()[itemStack.getItemDamage()];
+    list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX);
+  }
+
+  @Override
+  public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) {
+    return true;
+  }
+}
Author	SHA1	Message	Date
Martin Robertz	3f57c1ba79	Merge pull request #16 from GTNewHorizons/1.12-stuff 1.12 stuff	2020-05-10 13:51:46 +02:00
DreamMasterXXL	1e30b56d65	change version	2020-05-10 13:47:36 +02:00
DreamMasterXXL	bace7f93fe	update jenkins	2020-05-10 13:42:59 +02:00
DreamMasterXXL	dfd194159f	Merge remote-tracking branch 'Zoko/release/1.7.10/2.3' into 1.12-stuff # Conflicts: # .gitignore # gradle.properties # src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java	2020-05-10 13:38:46 +02:00
Zoko061602	15d7f7405b	Added 1.12 content	2020-05-10 12:36:33 +02:00
DreamMasterXXL	364f833b55	bump version	2020-04-18 23:40:47 +02:00
DreamMasterXXL	36eaeeb615	Merge remote-tracking branch 'Zoko/master'	2020-04-18 23:40:09 +02:00
Zoko061602	49c17652cd	Fixed Transceiver crash	2020-04-18 23:27:46 +02:00
DreamMasterXXL	6abe5ea4a9	bump version	2020-04-17 11:25:35 +02:00
Martin Robertz	be44112161	Merge pull request #15 from Zoko061602/master Fixed basic ItemFilter	2020-04-17 11:23:56 +02:00
Zoko061602	88d90c2d07	Fixed basic ItemFilter	2020-04-17 00:52:36 +02:00
DreamMasterXXL	7da7525257	Merge remote-tracking branch 'Zoko/master' # Conflicts: # gradle.properties	2020-04-17 00:49:58 +02:00
Zoko061602	3d40b4aae9	Added Stellar Armor Textures	2020-04-17 00:37:51 +02:00
Zoko061602	1b610403b3	Update localization, add filter recipes	2020-04-05 23:46:19 +02:00
Dream-Master	7d239bd2ab	ore dicted Endsteel nugget	2020-04-05 23:28:51 +02:00
Dream-Master	d325af0a96	bump version	2020-04-05 22:46:36 +02:00
Dream-Master	4735800f6c	update tooltip in lang file for stellar tools and armor	2020-04-05 22:18:11 +02:00
Dream-Master	a0be2aac7f	rename crude steel to Clay Compound	2020-04-05 20:43:32 +02:00
Dream-Master	5716fb0d21	bump version	2020-04-05 19:36:39 +02:00
Martin Robertz	c64025e8ca	Merge pull request #14 from Zoko061602/master Capacitors, Conduits, Stellar Armor	2020-04-05 19:35:54 +02:00
Zoko061602	bc46a1f198	Capacitors, Conduits, Stellar Armor	2020-04-05 18:29:44 +02:00
Dream-Master	88c32a6a63	bump version	2020-04-02 14:17:27 +02:00
Martin Robertz	5a0728e920	Merge pull request #13 from Zoko061602/master Added Big Item Filter	2020-04-02 14:16:03 +02:00
Dream-Master	15d53aeea2	bump version	2020-04-02 14:14:48 +02:00
Zoko061602	4e9b00702a	Added Big Item Filter	2020-04-02 14:13:47 +02:00
Martin Robertz	d2d2190950	Merge pull request #12 from Zoko061602/master Fixed Conduit Filter	2020-04-02 13:48:39 +02:00
Zoko061602	0d00ff00cb	Fixed Conduit Filter	2020-04-02 13:43:51 +02:00