From e06e30dc87f926e8581df6f857b2c40b03b84c78 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 6 Mar 2013 18:22:17 -0500 Subject: [PATCH 01/93] First draft. Still lots to do. --- .classpath | 2 +- common/buildcraft/BuildCraftBuilders.java | 16 +-- common/buildcraft/BuildCraftCore.java | 14 +-- common/buildcraft/BuildCraftEnergy.java | 14 +-- common/buildcraft/BuildCraftFactory.java | 18 +-- common/buildcraft/BuildCraftSilicon.java | 4 +- common/buildcraft/BuildCraftTransport.java | 20 +-- .../api/blueprints/BlueprintManager.java | 2 +- .../buildcraft/api/blueprints/BptBlock.java | 2 +- .../buildcraft/builders/BlockArchitect.java | 4 +- .../builders/BlockBlueprintLibrary.java | 2 +- common/buildcraft/builders/BlockBuilder.java | 4 +- .../builders/gui/GuiBlueprintLibrary.java | 11 +- .../buildcraft/core/ItemBlockBuildCraft.java | 2 +- common/buildcraft/core/ItemBuildCraft.java | 3 +- .../buildcraft/core/ItemRedstoneChipset.java | 4 +- common/buildcraft/core/SpringPopulate.java | 20 +-- .../core/blueprints/BptBlueprint.java | 2 +- common/buildcraft/core/proxy/CoreProxy.java | 2 +- .../core/render/TextureLiquidsFX.java | 118 ------------------ common/buildcraft/energy/BlockEngine.java | 2 +- common/buildcraft/energy/BlockOilFlowing.java | 4 +- .../buildcraft/energy/EnergyProxyClient.java | 7 -- common/buildcraft/energy/EngineIron.java | 20 +-- common/buildcraft/energy/ItemBucketOil.java | 13 +- .../energy/gui/GuiCombustionEngine.java | 38 ++---- .../buildcraft/energy/gui/GuiSteamEngine.java | 5 +- .../energy/render/TextureFuelFX.java | 20 --- .../energy/render/TextureOilFX.java | 20 --- .../energy/render/TextureOilFlowFX.java | 114 ----------------- .../buildcraft/factory/BlockMiningWell.java | 2 +- common/buildcraft/factory/BlockQuarry.java | 4 +- common/buildcraft/factory/BlockRefinery.java | 4 +- .../buildcraft/silicon/ItemAssemblyTable.java | 2 +- .../transport/BlockGenericPipe.java | 95 +++++++------- common/buildcraft/transport/ItemFacade.java | 4 +- common/buildcraft/transport/ItemGate.java | 4 +- common/buildcraft/transport/ItemPipe.java | 2 +- .../buildcraft/transport/TileGenericPipe.java | 5 +- .../transport/render/FacadeItemRenderer.java | 2 - .../transport/render/PipeWorldRenderer.java | 2 +- .../transport/render/RenderPipe.java | 2 +- .../transport/utils/FacadeMatrix.java | 34 ++--- 43 files changed, 168 insertions(+), 501 deletions(-) delete mode 100644 common/buildcraft/core/render/TextureLiquidsFX.java delete mode 100644 common/buildcraft/energy/render/TextureFuelFX.java delete mode 100644 common/buildcraft/energy/render/TextureOilFX.java delete mode 100644 common/buildcraft/energy/render/TextureOilFlowFX.java diff --git a/.classpath b/.classpath index 37cb1f94..9d71da7e 100644 --- a/.classpath +++ b/.classpath @@ -2,6 +2,6 @@ - + diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 9d78d3d7..51b03feb 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -231,35 +231,35 @@ public class BuildCraftBuilders { fillerDestroy = fillerDestroyProp.getBoolean(DefaultProps.FILLER_DESTROY); templateItem = new ItemBptTemplate(Integer.parseInt(templateItemId.value)); - templateItem.setItemName("templateItem"); + templateItem.setUnlocalizedName("templateItem"); LanguageRegistry.addName(templateItem, "Template"); blueprintItem = new ItemBptBluePrint(Integer.parseInt(blueprintItemId.value)); - blueprintItem.setItemName("blueprintItem"); + blueprintItem.setUnlocalizedName("blueprintItem"); LanguageRegistry.addName(blueprintItem, "Blueprint"); markerBlock = new BlockMarker(Integer.parseInt(markerId.value)); - CoreProxy.proxy.registerBlock(markerBlock.setBlockName("markerBlock")); + CoreProxy.proxy.registerBlock(markerBlock.setUnlocalizedName("markerBlock")); CoreProxy.proxy.addName(markerBlock, "Land Mark"); pathMarkerBlock = new BlockPathMarker(Integer.parseInt(pathMarkerId.value)); - CoreProxy.proxy.registerBlock(pathMarkerBlock.setBlockName("pathMarkerBlock")); + CoreProxy.proxy.registerBlock(pathMarkerBlock.setUnlocalizedName("pathMarkerBlock")); CoreProxy.proxy.addName(pathMarkerBlock, "Path Mark"); fillerBlock = new BlockFiller(Integer.parseInt(fillerId.value)); - CoreProxy.proxy.registerBlock(fillerBlock.setBlockName("fillerBlock")); + CoreProxy.proxy.registerBlock(fillerBlock.setUnlocalizedName("fillerBlock")); CoreProxy.proxy.addName(fillerBlock, "Filler"); builderBlock = new BlockBuilder(Integer.parseInt(builderId.value)); - CoreProxy.proxy.registerBlock(builderBlock.setBlockName("builderBlock")); + CoreProxy.proxy.registerBlock(builderBlock.setUnlocalizedName("builderBlock")); CoreProxy.proxy.addName(builderBlock, "Builder"); architectBlock = new BlockArchitect(Integer.parseInt(architectId.value)); - CoreProxy.proxy.registerBlock(architectBlock.setBlockName("architectBlock")); + CoreProxy.proxy.registerBlock(architectBlock.setUnlocalizedName("architectBlock")); CoreProxy.proxy.addName(architectBlock, "Architect Table"); libraryBlock = new BlockBlueprintLibrary(Integer.parseInt(libraryId.value)); - CoreProxy.proxy.registerBlock(libraryBlock.setBlockName("libraryBlock")); + CoreProxy.proxy.registerBlock(libraryBlock.setUnlocalizedName("libraryBlock")); CoreProxy.proxy.addName(libraryBlock, "Blueprint Library"); GameRegistry.registerTileEntity(TileMarker.class, "Marker"); diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index c353c985..87dd8a65 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -213,7 +213,7 @@ public class BuildCraftCore { Property wrenchId = BuildCraftCore.mainConfiguration.getItem("wrench.id", DefaultProps.WRENCH_ID); - wrenchItem = (new ItemWrench(wrenchId.getInt(DefaultProps.WRENCH_ID))).setIconIndex(0 * 16 + 2).setItemName("wrenchItem"); + wrenchItem = (new ItemWrench(wrenchId.getInt(DefaultProps.WRENCH_ID))).setIconIndex(0 * 16 + 2).setUnlocalizedName("wrenchItem"); LanguageRegistry.addName(wrenchItem, "Wrench"); Property springId = BuildCraftCore.mainConfiguration.getBlock("springBlock.id", DefaultProps.SPRING_ID); @@ -229,23 +229,23 @@ public class BuildCraftCore { BuildCraftCore.modifyWorld = modifyWorld.getBoolean(true); if(BuildCraftCore.modifyWorld) { - springBlock = new BlockSpring(Integer.parseInt(springId.value)).setBlockName("eternalSpring"); + springBlock = new BlockSpring(Integer.parseInt(springId.value)).setUnlocalizedName("eternalSpring"); GameRegistry.registerBlock(springBlock, "eternalSpring"); } - woodenGearItem = (new ItemBuildCraft(Integer.parseInt(woodenGearId.value))).setIconIndex(1 * 16 + 0).setItemName("woodenGearItem"); + woodenGearItem = (new ItemBuildCraft(Integer.parseInt(woodenGearId.value))).setIconIndex(1 * 16 + 0).setUnlocalizedName("woodenGearItem"); LanguageRegistry.addName(woodenGearItem, "Wooden Gear"); - stoneGearItem = (new ItemBuildCraft(Integer.parseInt(stoneGearId.value))).setIconIndex(1 * 16 + 1).setItemName("stoneGearItem"); + stoneGearItem = (new ItemBuildCraft(Integer.parseInt(stoneGearId.value))).setIconIndex(1 * 16 + 1).setUnlocalizedName("stoneGearItem"); LanguageRegistry.addName(stoneGearItem, "Stone Gear"); - ironGearItem = (new ItemBuildCraft(Integer.parseInt(ironGearId.value))).setIconIndex(1 * 16 + 2).setItemName("ironGearItem"); + ironGearItem = (new ItemBuildCraft(Integer.parseInt(ironGearId.value))).setIconIndex(1 * 16 + 2).setUnlocalizedName("ironGearItem"); LanguageRegistry.addName(ironGearItem, "Iron Gear"); - goldGearItem = (new ItemBuildCraft(Integer.parseInt(goldenGearId.value))).setIconIndex(1 * 16 + 3).setItemName("goldGearItem"); + goldGearItem = (new ItemBuildCraft(Integer.parseInt(goldenGearId.value))).setIconIndex(1 * 16 + 3).setUnlocalizedName("goldGearItem"); LanguageRegistry.addName(goldGearItem, "Gold Gear"); - diamondGearItem = (new ItemBuildCraft(Integer.parseInt(diamondGearId.value))).setIconIndex(1 * 16 + 4).setItemName("diamondGearItem"); + diamondGearItem = (new ItemBuildCraft(Integer.parseInt(diamondGearId.value))).setIconIndex(1 * 16 + 4).setUnlocalizedName("diamondGearItem"); LanguageRegistry.addName(diamondGearItem, "Diamond Gear"); } finally { mainConfiguration.save(); diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 3e318a14..8cecb76f 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -120,27 +120,27 @@ public class BuildCraftEnergy { LanguageRegistry.addName(new ItemStack(engineBlock, 1, 1), "Steam Engine"); LanguageRegistry.addName(new ItemStack(engineBlock, 1, 2), "Combustion Engine"); - oilStill = (new BlockOilStill(oilStillId.getInt(DefaultProps.OIL_STILL_ID), Material.water)).setBlockName("oil"); - CoreProxy.proxy.addName(oilStill.setBlockName("oilStill"), "Oil"); + oilStill = (new BlockOilStill(oilStillId.getInt(DefaultProps.OIL_STILL_ID), Material.water)).setUnlocalizedName("oil"); + CoreProxy.proxy.addName(oilStill.setUnlocalizedName("oilStill"), "Oil"); CoreProxy.proxy.registerBlock(oilStill); - oilMoving = (new BlockOilFlowing(oilMovingId.getInt(DefaultProps.OIL_MOVING_ID), Material.water)).setBlockName("oil"); - CoreProxy.proxy.addName(oilMoving.setBlockName("oilMoving"), "Oil"); + oilMoving = (new BlockOilFlowing(oilMovingId.getInt(DefaultProps.OIL_MOVING_ID), Material.water)).setUnlocalizedName("oil"); + CoreProxy.proxy.addName(oilMoving.setUnlocalizedName("oilMoving"), "Oil"); CoreProxy.proxy.registerBlock(oilMoving); // Oil and fuel if (oilMoving.blockID + 1 != oilStill.blockID) throw new RuntimeException("Oil Still id must be Oil Moving id + 1"); - fuel = new ItemBuildCraft(itemFuelId.getInt(DefaultProps.FUEL_ID)).setItemName("fuel"); + fuel = new ItemBuildCraft(itemFuelId.getInt(DefaultProps.FUEL_ID)).setUnlocalizedName("fuel"); LanguageRegistry.addName(fuel, "Fuel"); MinecraftForge.EVENT_BUS.register(new OilBucketHandler()); - bucketOil = (new ItemBucketOil(bucketOilId.getInt(DefaultProps.BUCKET_OIL_ID))).setItemName("bucketOil").setContainerItem(Item.bucketEmpty); + bucketOil = (new ItemBucketOil(bucketOilId.getInt(DefaultProps.BUCKET_OIL_ID))).setUnlocalizedName("bucketOil").setContainerItem(Item.bucketEmpty); LanguageRegistry.addName(bucketOil, "Oil Bucket"); - bucketFuel = new ItemBuildCraft(Integer.parseInt(bucketFuelId.value)).setItemName("bucketFuel").setContainerItem(Item.bucketEmpty); + bucketFuel = new ItemBuildCraft(Integer.parseInt(bucketFuelId.value)).setUnlocalizedName("bucketFuel").setContainerItem(Item.bucketEmpty); bucketFuel.setIconIndex(0 * 16 + 3).setMaxStackSize(1); LanguageRegistry.addName(bucketFuel, "Fuel Bucket"); diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index ad919001..18252e06 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -166,41 +166,41 @@ public class BuildCraftFactory { BuildCraftCore.mainConfiguration.save(); miningWellBlock = new BlockMiningWell(Integer.parseInt(minigWellId.value)); - CoreProxy.proxy.registerBlock(miningWellBlock.setBlockName("miningWellBlock")); + CoreProxy.proxy.registerBlock(miningWellBlock.setUnlocalizedName("miningWellBlock")); CoreProxy.proxy.addName(miningWellBlock, "Mining Well"); plainPipeBlock = new BlockPlainPipe(Integer.parseInt(plainPipeId.value)); - CoreProxy.proxy.registerBlock(plainPipeBlock.setBlockName("plainPipeBlock")); + CoreProxy.proxy.registerBlock(plainPipeBlock.setUnlocalizedName("plainPipeBlock")); CoreProxy.proxy.addName(plainPipeBlock, "Mining Pipe"); autoWorkbenchBlock = new BlockAutoWorkbench(Integer.parseInt(autoWorkbenchId.value)); - CoreProxy.proxy.registerBlock(autoWorkbenchBlock.setBlockName("autoWorkbenchBlock")); + CoreProxy.proxy.registerBlock(autoWorkbenchBlock.setUnlocalizedName("autoWorkbenchBlock")); CoreProxy.proxy.addName(autoWorkbenchBlock, "Automatic Crafting Table"); frameBlock = new BlockFrame(Integer.parseInt(frameId.value)); - CoreProxy.proxy.registerBlock(frameBlock.setBlockName("frameBlock")); + CoreProxy.proxy.registerBlock(frameBlock.setUnlocalizedName("frameBlock")); CoreProxy.proxy.addName(frameBlock, "Frame"); quarryBlock = new BlockQuarry(Integer.parseInt(quarryId.value)); - CoreProxy.proxy.registerBlock(quarryBlock.setBlockName("machineBlock")); + CoreProxy.proxy.registerBlock(quarryBlock.setUnlocalizedName("machineBlock")); CoreProxy.proxy.addName(quarryBlock, "Quarry"); tankBlock = new BlockTank(Integer.parseInt(tankId.value)); - CoreProxy.proxy.registerBlock(tankBlock.setBlockName("tankBlock")); + CoreProxy.proxy.registerBlock(tankBlock.setUnlocalizedName("tankBlock")); CoreProxy.proxy.addName(tankBlock, "Tank"); pumpBlock = new BlockPump(Integer.parseInt(pumpId.value)); - CoreProxy.proxy.registerBlock(pumpBlock.setBlockName("pumpBlock")); + CoreProxy.proxy.registerBlock(pumpBlock.setUnlocalizedName("pumpBlock")); CoreProxy.proxy.addName(pumpBlock, "Pump"); refineryBlock = new BlockRefinery(Integer.parseInt(refineryId.value)); - CoreProxy.proxy.registerBlock(refineryBlock.setBlockName("refineryBlock")); + CoreProxy.proxy.registerBlock(refineryBlock.setUnlocalizedName("refineryBlock")); CoreProxy.proxy.addName(refineryBlock, "Refinery"); hopperDisabled = Boolean.parseBoolean(hopperDisable.value); if (!hopperDisabled) { hopperBlock = new BlockHopper(Integer.parseInt(hopperId.value)); - CoreProxy.proxy.registerBlock(hopperBlock.setBlockName("blockHopper")); + CoreProxy.proxy.registerBlock(hopperBlock.setUnlocalizedName("blockHopper")); CoreProxy.proxy.addName(hopperBlock, "Hopper"); } diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index b2d29fbf..ea9b86b3 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -77,7 +77,7 @@ public class BuildCraftSilicon { BuildCraftCore.mainConfiguration.save(); laserBlock = new BlockLaser(Integer.parseInt(laserId.value)); - CoreProxy.proxy.addName(laserBlock.setBlockName("laserBlock"), "Laser"); + CoreProxy.proxy.addName(laserBlock.setUnlocalizedName("laserBlock"), "Laser"); CoreProxy.proxy.registerBlock(laserBlock); assemblyTableBlock = new BlockAssemblyTable(Integer.parseInt(assemblyTableId.value)); @@ -87,7 +87,7 @@ public class BuildCraftSilicon { LanguageRegistry.addName(new ItemStack(assemblyTableBlock, 0, 1), "Advanced Crafting Table"); redstoneChipset = new ItemRedstoneChipset(Integer.parseInt(redstoneChipsetId.value)); - redstoneChipset.setItemName("redstoneChipset"); + redstoneChipset.setUnlocalizedName("redstoneChipset"); } diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index a714e607..4440b95f 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -198,7 +198,7 @@ public class BuildCraftTransport { int meta = world.getBlockMetadata(i, j, k); for (String excluded : excludedBlocks) { - if (excluded.equals(block.getBlockName())) + if (excluded.equals(block.getUnlocalizedName())) return false; String[] tokens = excluded.split(":"); @@ -258,7 +258,7 @@ public class BuildCraftTransport { Property pipeWaterproofId = BuildCraftCore.mainConfiguration.getItem("pipeWaterproof.id", DefaultProps.PIPE_WATERPROOF_ID); pipeWaterproof = new ItemBuildCraft(Integer.parseInt(pipeWaterproofId.value)).setIconIndex(2 * 16 + 1); - pipeWaterproof.setItemName("pipeWaterproof"); + pipeWaterproof.setUnlocalizedName("pipeWaterproof"); pipeWaterproof.setCreativeTab(CreativeTabs.tabMaterials); LanguageRegistry.addName(pipeWaterproof, "Pipe Waterproof"); genericPipeBlock = new BlockGenericPipe(Integer.parseInt(genericPipeId.value)); @@ -304,44 +304,44 @@ public class BuildCraftTransport { Property redPipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "redPipeWire.id", DefaultProps.RED_PIPE_WIRE); redPipeWire = new ItemBuildCraft(Integer.parseInt(redPipeWireId.value)).setIconIndex(4 * 16 + 0); - redPipeWire.setItemName("redPipeWire"); + redPipeWire.setUnlocalizedName("redPipeWire"); LanguageRegistry.addName(redPipeWire, "Red Pipe Wire"); AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 1), new ItemStack(Item.redstone, 1), new ItemStack(Item.ingotIron, 1) }, 500, new ItemStack(redPipeWire, 8))); Property bluePipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "bluePipeWire.id", DefaultProps.BLUE_PIPE_WIRE); bluePipeWire = new ItemBuildCraft(Integer.parseInt(bluePipeWireId.value)).setIconIndex(4 * 16 + 1); - bluePipeWire.setItemName("bluePipeWire"); + bluePipeWire.setUnlocalizedName("bluePipeWire"); LanguageRegistry.addName(bluePipeWire, "Blue Pipe Wire"); AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Item.redstone, 1), new ItemStack(Item.ingotIron, 1) }, 500, new ItemStack(bluePipeWire, 8))); Property greenPipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "greenPipeWire.id", DefaultProps.GREEN_PIPE_WIRE); greenPipeWire = new ItemBuildCraft(Integer.parseInt(greenPipeWireId.value)).setIconIndex(4 * 16 + 2); - greenPipeWire.setItemName("greenPipeWire"); + greenPipeWire.setUnlocalizedName("greenPipeWire"); LanguageRegistry.addName(greenPipeWire, "Green Pipe Wire"); AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 2), new ItemStack(Item.redstone, 1), new ItemStack(Item.ingotIron, 1) }, 500, new ItemStack(greenPipeWire, 8))); Property yellowPipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "yellowPipeWire.id", DefaultProps.YELLOW_PIPE_WIRE); yellowPipeWire = new ItemBuildCraft(Integer.parseInt(yellowPipeWireId.value)).setIconIndex(4 * 16 + 3); - yellowPipeWire.setItemName("yellowPipeWire"); + yellowPipeWire.setUnlocalizedName("yellowPipeWire"); LanguageRegistry.addName(yellowPipeWire, "Yellow Pipe Wire"); AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 11), new ItemStack(Item.redstone, 1), new ItemStack(Item.ingotIron, 1) }, 500, new ItemStack(yellowPipeWire, 8))); Property pipeGateId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "pipeGate.id", DefaultProps.GATE_ID); pipeGate = new ItemGate(Integer.parseInt(pipeGateId.value), 0).setIconIndex(2 * 16 + 3); - pipeGate.setItemName("pipeGate"); + pipeGate.setUnlocalizedName("pipeGate"); Property pipeGateAutarchicId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "pipeGateAutarchic.id", DefaultProps.GATE_AUTARCHIC_ID); pipeGateAutarchic = new ItemGate(Integer.parseInt(pipeGateAutarchicId.value), 1).setIconIndex(2 * 16 + 3); - pipeGateAutarchic.setItemName("pipeGateAutarchic"); + pipeGateAutarchic.setUnlocalizedName("pipeGateAutarchic"); Property pipeFacadeId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "pipeFacade.id", DefaultProps.PIPE_FACADE_ID); facadeItem = new ItemFacade(Integer.parseInt(pipeFacadeId.value)); - facadeItem.setItemName("pipeFacade"); + facadeItem.setUnlocalizedName("pipeFacade"); } finally { BuildCraftCore.mainConfiguration.save(); @@ -440,7 +440,7 @@ public class BuildCraftTransport { int id = prop.getInt(defaultID); ItemPipe res = BlockGenericPipe.registerPipe(id, clas); - res.setItemName(clas.getSimpleName()); + res.setUnlocalizedName(clas.getSimpleName()); LanguageRegistry.addName(res, descr); // Add appropriate recipe to temporary list diff --git a/common/buildcraft/api/blueprints/BlueprintManager.java b/common/buildcraft/api/blueprints/BlueprintManager.java index 4a528bef..bea845cc 100644 --- a/common/buildcraft/api/blueprints/BlueprintManager.java +++ b/common/buildcraft/api/blueprints/BlueprintManager.java @@ -16,7 +16,7 @@ public class BlueprintManager { sig.itemClassName = item.getClass().getSimpleName(); } - sig.itemName = item.getItemNameIS(new ItemStack(item)); + sig.itemName = item.getUnlocalizedName(new ItemStack(item)); return sig; } diff --git a/common/buildcraft/api/blueprints/BptBlock.java b/common/buildcraft/api/blueprints/BptBlock.java index d1785b46..aaf0678b 100644 --- a/common/buildcraft/api/blueprints/BptBlock.java +++ b/common/buildcraft/api/blueprints/BptBlock.java @@ -206,7 +206,7 @@ public class BptBlock { } } - sig.blockName = block.getBlockName(); + sig.blockName = block.getUnlocalizedName(); sig.replaceNullWithStar(); return sig; diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index beb57f01..bb27f819 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -108,8 +108,8 @@ public class BlockArchitect extends BlockContainer { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving) { - super.onBlockPlacedBy(world, i, j, k, entityliving); + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack stack) { + super.onBlockPlacedBy(world, i, j, k, entityliving, stack); ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 2246d3e1..ffcf139d 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -72,7 +72,7 @@ public class BlockBlueprintLibrary extends BlockContainer { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving) { + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack stack) { if (CoreProxy.proxy.isSimulating(world) && entityliving instanceof EntityPlayer) { TileBlueprintLibrary tile = (TileBlueprintLibrary) world.getBlockTileEntity(i, j, k); tile.owner = ((EntityPlayer) entityliving).username; diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 7671c26a..3f10970d 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -112,8 +112,8 @@ public class BlockBuilder extends BlockContainer { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving) { - super.onBlockPlacedBy(world, i, j, k, entityliving); + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack stack) { + super.onBlockPlacedBy(world, i, j, k, entityliving, stack); ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal()); diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index c40282c5..2b818761 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -110,16 +110,9 @@ public class GuiBlueprintLibrary extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = 0; - // if (library.owner.equals(player.username)) { - i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/library_rw.png"); - // } else { - // i = mc.renderEngine - // .getTexture("/net/minecraft/src/buildcraft/builders/gui/library_r.png"); - // } + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/library_rw.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/core/ItemBlockBuildCraft.java b/common/buildcraft/core/ItemBlockBuildCraft.java index 5d2383ab..f969c40f 100644 --- a/common/buildcraft/core/ItemBlockBuildCraft.java +++ b/common/buildcraft/core/ItemBlockBuildCraft.java @@ -20,7 +20,7 @@ public class ItemBlockBuildCraft extends ItemBlock { @Override public String getItemDisplayName(ItemStack itemstack) { - return StringUtil.localize(getItemNameIS(itemstack)); + return StringUtil.localize(getUnlocalizedName(itemstack)); } } diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index 1723f057..af559505 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -17,12 +17,11 @@ public class ItemBuildCraft extends Item { public ItemBuildCraft(int i) { super(i); - setTextureFile(DefaultProps.TEXTURE_ITEMS); setCreativeTab(CreativeTabBuildCraft.tabBuildCraft); } @Override public String getItemDisplayName(ItemStack itemstack) { - return StringUtil.localize(getItemNameIS(itemstack)); + return StringUtil.localize(getUnlocalizedName(itemstack)); } } diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index 1fc02f47..5864ee86 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -35,8 +35,8 @@ public class ItemRedstoneChipset extends ItemBuildCraft { } @Override - public String getItemNameIS(ItemStack itemstack) { - return (new StringBuilder()).append(super.getItemName()).append(".").append(itemstack.getItemDamage()).toString(); + public String getUnlocalizedName(ItemStack itemstack) { + return (new StringBuilder()).append(super.getUnlocalizedName()).append(".").append(itemstack.getItemDamage()).toString(); } @Override diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index 69f3f800..b9bf5a0a 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -22,7 +22,7 @@ public class SpringPopulate { @ForgeSubscribe public void populate(PopulateChunkEvent.Post event) { - + boolean doGen = TerrainGen.populate(event.chunkProvider, event.world, event.rand, event.chunkX, event.chunkX, event.hasVillageGenerated, PopulateChunkEvent.Populate.EventType.CUSTOM); if (!doGen) { @@ -35,13 +35,13 @@ public class SpringPopulate { doPopulate(event.world, event.rand, worldX, worldZ); } - + private void doPopulate(World world, Random random, int x, int z) { // A spring will be generated every 40th chunk. if(random.nextFloat() > 0.025f) return; - + // Do not generate water in the End or the Nether BiomeGenBase biomegenbase = world.getWorldChunkManager().getBiomeGenAt(x, z); if (biomegenbase.biomeID == BiomeGenBase.sky.biomeID || biomegenbase.biomeID == BiomeGenBase.hell.biomeID) @@ -49,17 +49,17 @@ public class SpringPopulate { int posX = x + random.nextInt(16); int posZ = z + random.nextInt(16); - + for(int i = 0; i < 5; i++) { int candidate = world.getBlockId(posX, i, posZ); if(candidate != Block.bedrock.blockID) continue; - - world.setBlock(posX, i + 1, posZ, BuildCraftCore.springBlock.blockID); + + world.func_94575_c(posX, i + 1, posZ, BuildCraftCore.springBlock.blockID); for(int j = i + 2; j < world.getActualHeight() - 10; j++) { if(!boreToSurface(world, posX, j, posZ)) { if(world.isAirBlock(posX, j, posZ)) - world.setBlockWithNotify(posX, j, posZ, Block.waterStill.blockID); + world.func_94575_c(posX, j, posZ, Block.waterStill.blockID); break; } } @@ -70,15 +70,15 @@ public class SpringPopulate { private boolean boreToSurface(World world, int x, int y, int z) { if(world.isAirBlock(x, y, z)) return false; - + int existing = world.getBlockId(x, y, z); if(existing != Block.stone.blockID && existing != Block.dirt.blockID && existing != Block.gravel.blockID && existing != Block.grass.blockID) return false; - - world.setBlockWithNotify(x, y, z, Block.waterStill.blockID); + + world.func_94575_c(x, y, z, Block.waterStill.blockID); return true; } } diff --git a/common/buildcraft/core/blueprints/BptBlueprint.java b/common/buildcraft/core/blueprints/BptBlueprint.java index 80f8fd69..ce08322b 100644 --- a/common/buildcraft/core/blueprints/BptBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBlueprint.java @@ -358,7 +358,7 @@ public class BptBlueprint extends BptBase { if (!"*".equals(sig.itemClassName) && !item.getClass().getSimpleName().equals(sig.itemClassName)) return false; - if (!"*".equals(sig.itemName) && !item.getItemNameIS(new ItemStack(item)).equals(sig.itemName)) + if (!"*".equals(sig.itemName) && !item.getUnlocalizedName(new ItemStack(item)).equals(sig.itemName)) return false; return true; diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java index f3dcbea4..e516d95c 100644 --- a/common/buildcraft/core/proxy/CoreProxy.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -98,7 +98,7 @@ public class CoreProxy { /* REGISTRATION */ public void registerBlock(Block block) { Item.itemsList[block.blockID] = null; - Item.itemsList[block.blockID] = new ItemBlockBuildCraft(block.blockID - 256, block.getBlockName()); + Item.itemsList[block.blockID] = new ItemBlockBuildCraft(block.blockID - 256, block.getUnlocalizedName()); } public void registerTileEntity(Class clas, String ident) { diff --git a/common/buildcraft/core/render/TextureLiquidsFX.java b/common/buildcraft/core/render/TextureLiquidsFX.java deleted file mode 100644 index 9bab2ded..00000000 --- a/common/buildcraft/core/render/TextureLiquidsFX.java +++ /dev/null @@ -1,118 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ - -package buildcraft.core.render; - -import net.minecraft.client.renderer.RenderEngine; -import net.minecraftforge.client.ForgeHooksClient; -import cpw.mods.fml.client.FMLTextureFX; - -public class TextureLiquidsFX extends FMLTextureFX { - - private final int redMin, redMax, greenMin, greenMax, blueMin, blueMax; - private final String texture; - - public TextureLiquidsFX(int redMin, int redMax, int greenMin, int greenMax, int blueMin, int blueMax, int spriteIndex, String texture) { - super(spriteIndex); - - this.redMin = redMin; - this.redMax = redMax; - this.greenMin = greenMin; - this.greenMax = greenMax; - this.blueMin = blueMin; - this.blueMax = blueMax; - this.texture = texture; - setup(); - } - - @Override - public void setup() { - super.setup(); - - red = new float[tileSizeSquare]; - green = new float[tileSizeSquare]; - blue = new float[tileSizeSquare]; - alpha = new float[tileSizeSquare]; - } - - @Override - public void bindImage(RenderEngine renderengine) { - ForgeHooksClient.bindTexture(texture, 0); - } - - @Override - public void onTick() { - - for (int i = 0; i < tileSizeBase; ++i) { - for (int j = 0; j < tileSizeBase; ++j) { - float var3 = 0.0F; - - for (int k = i - 1; k <= i + 1; ++k) { - int r = k & tileSizeMask; - int g = j & tileSizeMask; - var3 += this.red[r + g * tileSizeBase]; - } - - this.green[i + j * tileSizeBase] = var3 / 3.3F + this.blue[i + j * tileSizeBase] * 0.8F; - } - } - - for (int i = 0; i < tileSizeBase; ++i) { - for (int j = 0; j < tileSizeBase; ++j) { - this.blue[i + j * tileSizeBase] += this.alpha[i + j * tileSizeBase] * 0.05F; - - if (this.blue[i + j * tileSizeBase] < 0.0F) { - this.blue[i + j * tileSizeBase] = 0.0F; - } - - this.alpha[i + j * tileSizeBase] -= 0.1F; - - if (Math.random() < 0.05D) { - this.alpha[i + j * tileSizeBase] = 0.5F; - } - } - } - - float af[] = green; - green = red; - red = af; - for (int i1 = 0; i1 < tileSizeSquare; i1++) { - float f1 = red[i1]; - if (f1 > 1.0F) { - f1 = 1.0F; - } - if (f1 < 0.0F) { - f1 = 0.0F; - } - float f2 = f1 * f1; - int r = (int) (redMin + f2 * (redMax - redMin)); - int g = (int) (greenMin + f2 * (greenMax - greenMin)); - int b = (int) (blueMin + f2 * (blueMax - blueMin)); - if (anaglyphEnabled) { - int i3 = (r * 30 + g * 59 + b * 11) / 100; - int j3 = (r * 30 + g * 70) / 100; - int k3 = (r * 30 + b * 70) / 100; - r = i3; - g = j3; - b = k3; - } - - imageData[i1 * 4 + 0] = (byte) r; - imageData[i1 * 4 + 1] = (byte) g; - imageData[i1 * 4 + 2] = (byte) b; - imageData[i1 * 4 + 3] = (byte) 255; - } - - } - - protected float red[]; - protected float green[]; - protected float blue[]; - protected float alpha[]; -} diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 668a9fdd..c754b5e1 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -36,7 +36,7 @@ public class BlockEngine extends BlockContainer { setHardness(0.5F); setCreativeTab(CreativeTabBuildCraft.tabBuildCraft); - setBlockName("engineBlock"); + setUnlocalizedName("engineBlock"); } @Override diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index 89264b38..c47f9350 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -80,7 +80,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { world.setBlockWithNotify(i, j, k, 0); } else { world.setBlockMetadataWithNotify(i, j, k, l); - world.scheduleBlockUpdate(i, j, k, blockID, tickRate()); + world.scheduleBlockUpdate(i, j, k, blockID, tickRate(world)); world.notifyBlocksOfNeighborChange(i, j, k, blockID); } } else if (flag) { @@ -240,7 +240,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { public void onBlockAdded(World world, int i, int j, int k) { super.onBlockAdded(world, i, j, k); if (world.getBlockId(i, j, k) == blockID) { - world.scheduleBlockUpdate(i, j, k, blockID, tickRate()); + world.scheduleBlockUpdate(i, j, k, blockID, tickRate(world)); } } diff --git a/common/buildcraft/energy/EnergyProxyClient.java b/common/buildcraft/energy/EnergyProxyClient.java index dbd96404..11d5512b 100644 --- a/common/buildcraft/energy/EnergyProxyClient.java +++ b/common/buildcraft/energy/EnergyProxyClient.java @@ -5,9 +5,6 @@ import buildcraft.core.DefaultProps; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; import buildcraft.energy.render.RenderEngine; -import buildcraft.energy.render.TextureFuelFX; -import buildcraft.energy.render.TextureOilFX; -import buildcraft.energy.render.TextureOilFlowFX; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; @@ -21,10 +18,6 @@ public class EnergyProxyClient extends EnergyProxy { @Override public void registerTextureFX() { net.minecraft.client.renderer.RenderEngine renderEngine = FMLClientHandler.instance().getClient().renderEngine; - - renderEngine.registerTextureFX(new TextureOilFX()); - renderEngine.registerTextureFX(new TextureFuelFX()); - renderEngine.registerTextureFX(new TextureOilFlowFX()); } @Override diff --git a/common/buildcraft/energy/EngineIron.java b/common/buildcraft/energy/EngineIron.java index 6373bd6b..d39fd3fd 100644 --- a/common/buildcraft/energy/EngineIron.java +++ b/common/buildcraft/energy/EngineIron.java @@ -107,7 +107,7 @@ public class EngineIron extends Engine { if (burnTime > 0 || fuel.amount > 0) { if (burnTime > 0) { burnTime--; - } + } if (burnTime <= 0) { if(fuel != null) { if (--fuel.amount <= 0) { @@ -125,7 +125,7 @@ public class EngineIron extends Engine { } } else if (penaltyCooling <= 0) { if (lastPowered) { - lastPowered = false; + lastPowered = false; penaltyCooling = 30 * 20; // 30 sec of penalty on top of the cooling } @@ -431,19 +431,11 @@ public class EngineIron extends Engine { } } - public int getFuelId() { - return fuelTank.getLiquid() != null ? fuelTank.getLiquid().itemID : 0; + public LiquidStack getFuel() { + return fuelTank.getLiquid(); } - public int getFuelMeta() { - return fuelTank.getLiquid() != null ? fuelTank.getLiquid().itemMeta : 0; - } - - public int getCoolantId() { - return coolantTank.getLiquid() != null ? coolantTank.getLiquid().itemID : 0; - } - - public int getCoolantMeta() { - return coolantTank.getLiquid() != null ? coolantTank.getLiquid().itemMeta : 0; + public LiquidStack getCoolant() { + return coolantTank.getLiquid(); } } diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java index 84c69d21..c114ad80 100644 --- a/common/buildcraft/energy/ItemBucketOil.java +++ b/common/buildcraft/energy/ItemBucketOil.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -26,12 +26,7 @@ public class ItemBucketOil extends ItemBucket { @Override public String getItemDisplayName(ItemStack itemstack) { - return StringUtil.localize(getItemNameIS(itemstack)); - } - - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_ITEMS; + return StringUtil.localize(getUnlocalizedName(itemstack)); } } diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index 76db9c90..693fd9ad 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -13,6 +13,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.Item; import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; @@ -37,9 +38,8 @@ public class GuiCombustionEngine extends GuiEngine { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); @@ -48,31 +48,19 @@ public class GuiCombustionEngine extends GuiEngine { EngineIron engineIron = ((EngineIron) engine.engine); if (engine.getScaledBurnTime(58) > 0) { - displayGauge(j, k, 19, 104, engine.getScaledBurnTime(58), engineIron.getFuelId(), engineIron.getFuelMeta()); + displayGauge(j, k, 19, 104, engine.getScaledBurnTime(58), engineIron.getFuel()); } if (engineIron.getScaledCoolant(58) > 0) { - displayGauge(j, k, 19, 122, engineIron.getScaledCoolant(58), engineIron.getCoolantId(), engineIron.getCoolantMeta()); + displayGauge(j, k, 19, 122, engineIron.getScaledCoolant(58), engineIron.getCoolant()); } } - private void displayGauge(int j, int k, int line, int col, int squaled, int liquidId, int liquidMeta) { - int liquidImgIndex = 0; - - if (liquidId <= 0) - return; - if (liquidId < Block.blocksList.length && Block.blocksList[liquidId] != null) { - ForgeHooksClient.bindTexture(Block.blocksList[liquidId].getTextureFile(), 0); - liquidImgIndex = Block.blocksList[liquidId].blockIndexInTexture; - } else if (Item.itemsList[liquidId] != null) { - ForgeHooksClient.bindTexture(Item.itemsList[liquidId].getTextureFile(), 0); - liquidImgIndex = Item.itemsList[liquidId].getIconFromDamage(liquidMeta); - } else - return; - - int imgLine = liquidImgIndex / 16; - int imgColumn = liquidImgIndex - imgLine * 16; - + private void displayGauge(int j, int k, int line, int col, int squaled, LiquidStack liquid) { + if (liquid == null) + { + return; + } int start = 0; while (true) { @@ -86,7 +74,7 @@ public class GuiCombustionEngine extends GuiEngine { squaled = 0; } - drawTexturedModalRect(j + col, k + line + 58 - x - start, imgColumn * 16, imgLine * 16 + (16 - x), 16, 16 - (16 - x)); + func_94065_a(j + col, k + line + 58 - x - start, liquid.getRenderingIcon(), 16, 16 - (16 - x)); start = start + 16; if (x == 0 || squaled == 0) { @@ -94,9 +82,7 @@ public class GuiCombustionEngine extends GuiEngine { } } - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); - - mc.renderEngine.bindTexture(i); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); drawTexturedModalRect(j + col, k + line, 176, 0, 16, 60); } } diff --git a/common/buildcraft/energy/gui/GuiSteamEngine.java b/common/buildcraft/energy/gui/GuiSteamEngine.java index fcb73570..17a75b42 100644 --- a/common/buildcraft/energy/gui/GuiSteamEngine.java +++ b/common/buildcraft/energy/gui/GuiSteamEngine.java @@ -33,9 +33,8 @@ public class GuiSteamEngine extends GuiEngine { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/steam_engine_gui.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/steam_engine_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/energy/render/TextureFuelFX.java b/common/buildcraft/energy/render/TextureFuelFX.java deleted file mode 100644 index ec089d16..00000000 --- a/common/buildcraft/energy/render/TextureFuelFX.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ - -package buildcraft.energy.render; - -import buildcraft.BuildCraftEnergy; -import buildcraft.core.render.TextureLiquidsFX; - -public class TextureFuelFX extends TextureLiquidsFX { - - public TextureFuelFX() { - super(150, 250, 150, 250, 0, 10, BuildCraftEnergy.fuel.getIconFromDamage(0), BuildCraftEnergy.fuel.getTextureFile()); - } -} diff --git a/common/buildcraft/energy/render/TextureOilFX.java b/common/buildcraft/energy/render/TextureOilFX.java deleted file mode 100644 index 4eef2419..00000000 --- a/common/buildcraft/energy/render/TextureOilFX.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ - -package buildcraft.energy.render; - -import buildcraft.BuildCraftEnergy; -import buildcraft.core.render.TextureLiquidsFX; - -public class TextureOilFX extends TextureLiquidsFX { - - public TextureOilFX() { - super(10, 31, 10, 31, 10, 31, BuildCraftEnergy.oilStill.blockIndexInTexture, BuildCraftEnergy.oilStill.getTextureFile()); - } -} diff --git a/common/buildcraft/energy/render/TextureOilFlowFX.java b/common/buildcraft/energy/render/TextureOilFlowFX.java deleted file mode 100644 index f19f6ac9..00000000 --- a/common/buildcraft/energy/render/TextureOilFlowFX.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright (c) SpaceToad, 2011 - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ - -package buildcraft.energy.render; - -import net.minecraft.client.renderer.RenderEngine; - -import org.lwjgl.opengl.GL11; - -import buildcraft.BuildCraftEnergy; -import buildcraft.core.DefaultProps; -import cpw.mods.fml.client.FMLTextureFX; - -public class TextureOilFlowFX extends FMLTextureFX { - - public TextureOilFlowFX() { - super(BuildCraftEnergy.oilMoving.blockIndexInTexture + 1); - - tileSize = 2; - - } - - @Override - protected void setup() { - super.setup(); - field_1138_g = new float[tileSizeSquare]; - field_1137_h = new float[tileSizeSquare]; - field_1136_i = new float[tileSizeSquare]; - field_1135_j = new float[tileSizeSquare]; - field_1134_k = 0; - } - - @Override - public void bindImage(RenderEngine renderengine) { - GL11.glBindTexture(3553, renderengine.getTexture(DefaultProps.TEXTURE_BLOCKS)); - } - - @Override - public void onTick() { - field_1134_k++; - for (int i = 0; i < tileSizeBase; i++) { - for (int k = 0; k < tileSizeBase; k++) { - float f = 0.0F; - for (int j1 = k - 2; j1 <= k; j1++) { - int k1 = i & tileSizeMask; - int i2 = j1 & tileSizeMask; - f += field_1138_g[k1 + i2 * tileSizeBase]; - } - - field_1137_h[i + k * tileSizeBase] = f / 3.2F + field_1136_i[i + k * tileSizeBase] * 0.8F; - } - } - - for (int j = 0; j < tileSizeBase; j++) { - for (int l = 0; l < tileSizeBase; l++) { - field_1136_i[j + l * tileSizeBase] += field_1135_j[j + l * tileSizeBase] * 0.05F; - if (field_1136_i[j + l * tileSizeBase] < 0.0F) { - field_1136_i[j + l * tileSizeBase] = 0.0F; - } - field_1135_j[j + l * tileSizeBase] -= 0.3F; - if (Math.random() < 0.20000000000000001D) { - field_1135_j[j + l * tileSizeBase] = 0.5F; - } - } - } - - float af[] = field_1137_h; - field_1137_h = field_1138_g; - field_1138_g = af; - for (int i1 = 0; i1 < tileSizeSquare; i1++) { - float f1 = field_1138_g[i1 - field_1134_k * tileSizeBase & tileSizeSquareMask]; - if (f1 > 1.0F) { - f1 = 1.0F; - } - if (f1 < 0.0F) { - f1 = 0.0F; - } - float f2 = f1 * f1; - int l1 = (int) (10F + f2 * 22F); - int j2 = (int) (50F + f2 * 64F); - int k2 = 255; - if (anaglyphEnabled) { - int i3 = (l1 * 30 + j2 * 59 + k2 * 11) / 100; - int j3 = (l1 * 30 + j2 * 70) / 100; - int k3 = (l1 * 30 + k2 * 70) / 100; - l1 = i3; - j2 = j3; - k2 = k3; - } - // imageData[i1 * 4 + 0] = (byte)l1; - // imageData[i1 * 4 + 1] = (byte)j2; - // imageData[i1 * 4 + 2] = (byte) k2; - // imageData[i1 * 4 + 3] = /*(byte)l2*/(byte)255; - - imageData[i1 * 4 + 0] = (byte) l1; - imageData[i1 * 4 + 1] = (byte) l1; - imageData[i1 * 4 + 2] = (byte) l1; - imageData[i1 * 4 + 3] = /* (byte)l2 */(byte) 255; - } - - } - - protected float field_1138_g[]; - protected float field_1137_h[]; - protected float field_1136_i[]; - protected float field_1135_j[]; - private int field_1134_k; -} diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index a25ccdaf..b919a7fb 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -57,7 +57,7 @@ public class BlockMiningWell extends BlockMachineRoot { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving) { + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack stack) { ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal()); diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 53e4295e..f4f19f71 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -47,8 +47,8 @@ public class BlockQuarry extends BlockMachineRoot { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving) { - super.onBlockPlacedBy(world, i, j, k, entityliving); + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack stack) { + super.onBlockPlacedBy(world, i, j, k, entityliving, stack); ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index 93b1f88a..b6da78d7 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -65,8 +65,8 @@ public class BlockRefinery extends BlockContainer { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving) { - super.onBlockPlacedBy(world, i, j, k, entityliving); + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack stack) { + super.onBlockPlacedBy(world, i, j, k, entityliving, stack); ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); diff --git a/common/buildcraft/silicon/ItemAssemblyTable.java b/common/buildcraft/silicon/ItemAssemblyTable.java index 83af6d3e..6d8beb04 100644 --- a/common/buildcraft/silicon/ItemAssemblyTable.java +++ b/common/buildcraft/silicon/ItemAssemblyTable.java @@ -11,7 +11,7 @@ public class ItemAssemblyTable extends ItemBlock { } @Override - public String getItemNameIS(ItemStack par1ItemStack) { + public String getUnlocalizedName(ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() == 0 ? "block.assemblyTableBlock" : "block.assemblyWorkbenchBlock"; } diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 2f457097..346c8031 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -47,13 +47,13 @@ public class BlockGenericPipe extends BlockContainer { Pipe, Gate } - + static class RaytraceResult { RaytraceResult(Part hitPart, MovingObjectPosition movingObjectPosition) { this.hitPart = hitPart; this.movingObjectPosition = movingObjectPosition; } - + public Part hitPart; public MovingObjectPosition movingObjectPosition; } @@ -230,14 +230,14 @@ public class BlockGenericPipe extends BlockContainer { @Override public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction) { RaytraceResult raytraceResult = doRayTrace(world, x, y, z, origin, direction); - + if (raytraceResult == null) { return null; } else { return raytraceResult.movingObjectPosition; } } - + public RaytraceResult doRayTrace(World world, int x, int y, int z, EntityPlayer entityPlayer) { double pitch = Math.toRadians(entityPlayer.rotationPitch); double yaw = Math.toRadians(entityPlayer.rotationYaw); @@ -245,39 +245,39 @@ public class BlockGenericPipe extends BlockContainer { double dirX = -Math.sin(yaw) * Math.cos(pitch); double dirY = -Math.sin(pitch); double dirZ = Math.cos(yaw) * Math.cos(pitch); - + double reachDistance = 5; - + if (entityPlayer instanceof EntityPlayerMP) { reachDistance = ((EntityPlayerMP) entityPlayer).theItemInWorldManager.getBlockReachDistance(); } - - Vec3 origin = Vec3.vec3dPool.getVecFromPool(entityPlayer.posX, entityPlayer.posY + 1.62 - entityPlayer.yOffset, entityPlayer.posZ); + + Vec3 origin = Vec3.fakePool.getVecFromPool(entityPlayer.posX, entityPlayer.posY + 1.62 - entityPlayer.yOffset, entityPlayer.posZ); Vec3 direction = origin.addVector(dirX * reachDistance, dirY * reachDistance, dirZ * reachDistance); - + return doRayTrace(world, x, y, z, origin, direction); } - + public RaytraceResult doRayTrace(World world, int x, int y, int z, Vec3 origin, Vec3 direction) { float xMin = Utils.pipeMinPos, xMax = Utils.pipeMaxPos, yMin = Utils.pipeMinPos, yMax = Utils.pipeMaxPos, zMin = Utils.pipeMinPos, zMax = Utils.pipeMaxPos; TileEntity pipeTileEntity = world.getBlockTileEntity(x, y, z); Pipe pipe = getPipe(world, x, y, z); - + if (pipeTileEntity == null || !isValid(pipe)) { return null; } - + /** - * pipe hits along x, y, and z axis, gate (all 6 sides) [and wires+facades] + * pipe hits along x, y, and z axis, gate (all 6 sides) [and wires+facades] */ MovingObjectPosition[] hits = new MovingObjectPosition[] { null, null, null, null, null, null, null, null, null }; - + boolean needAxisCheck = false; boolean needCenterCheck = true; - + // check along the x axis - + if (Utils.checkPipesConnections(world, pipeTileEntity, x - 1, y, z)) { xMin = 0.0F; needAxisCheck = true; @@ -287,7 +287,7 @@ public class BlockGenericPipe extends BlockContainer { xMax = 1.0F; needAxisCheck = true; } - + if (needAxisCheck) { setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax); @@ -297,7 +297,7 @@ public class BlockGenericPipe extends BlockContainer { needAxisCheck = false; needCenterCheck = false; // center already checked through this axis } - + // check along the y axis if (Utils.checkPipesConnections(world, pipeTileEntity, x, y - 1, z)) { @@ -309,7 +309,7 @@ public class BlockGenericPipe extends BlockContainer { yMax = 1.0F; needAxisCheck = true; } - + if (needAxisCheck) { setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax); @@ -319,7 +319,7 @@ public class BlockGenericPipe extends BlockContainer { needAxisCheck = false; needCenterCheck = false; // center already checked through this axis } - + // check along the z axis if (Utils.checkPipesConnections(world, pipeTileEntity, x, y, z - 1)) { @@ -331,7 +331,7 @@ public class BlockGenericPipe extends BlockContainer { zMax = 1.0F; needAxisCheck = true; } - + if (needAxisCheck) { setBlockBounds(xMin, yMin, zMin, xMax, yMax, zMax); @@ -341,7 +341,7 @@ public class BlockGenericPipe extends BlockContainer { needAxisCheck = false; needCenterCheck = false; // center already checked through this axis } - + // check center (only if no axis were checked/the pipe has no connections) if (needCenterCheck) { @@ -349,59 +349,59 @@ public class BlockGenericPipe extends BlockContainer { hits[0] = super.collisionRayTrace(world, x, y, z, origin, direction); } - + // gates - + if (pipe.hasGate()) { for (int side = 0; side < 6; side++) { setBlockBoundsToGate(ForgeDirection.VALID_DIRECTIONS[side]); - + hits[3 + side] = super.collisionRayTrace(world, x, y, z, origin, direction); } } - + // TODO: check wires, facades // get closest hit - + double minLengthSquared = Double.POSITIVE_INFINITY; int minIndex = -1; - + for (int i = 0; i < hits.length; i++) { MovingObjectPosition hit = hits[i]; if (hit == null) continue; - + double lengthSquared = hit.hitVec.squareDistanceTo(origin); - + if (lengthSquared < minLengthSquared) { minLengthSquared = lengthSquared; minIndex = i; } } - + // reset bounds - + setBlockBounds(0, 0, 0, 1, 1, 1); - + if (minIndex == -1) { return null; } else { Part hitPart; - + if (minIndex < 3) { hitPart = Part.Pipe; } else { hitPart = Part.Gate; } - + return new RaytraceResult(hitPart, hits[minIndex]); } } - + private void setBlockBoundsToGate(ForgeDirection dir) { float min = Utils.pipeMinPos + 0.05F; float max = Utils.pipeMaxPos - 0.05F; - + switch (dir) { case DOWN: setBlockBounds(min, Utils.pipeMinPos - 0.10F, min, max, Utils.pipeMinPos, max); @@ -537,17 +537,17 @@ public class BlockGenericPipe extends BlockContainer { return meta; } - + @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving placer) { - super.onBlockPlacedBy(world, x, y, z, placer); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving placer, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, placer, stack); Pipe pipe = getPipe(world, x, y, z); if (isValid(pipe)) { pipe.onBlockPlacedBy(placer); } } - + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int par6, float xOffset, float yOffset, float zOffset) { super.onBlockActivated(world, x, y, z, entityplayer, par6, xOffset, yOffset, zOffset); @@ -629,17 +629,17 @@ public class BlockGenericPipe extends BlockContainer { pipe.container.scheduleRenderUpdate(); return true; } - + boolean openGateGui = false; if (pipe.hasGate()) { RaytraceResult rayTraceResult = doRayTrace(world, x, y, z, entityplayer); - + if (rayTraceResult != null && rayTraceResult.hitPart == Part.Gate) { openGateGui = true; } } - + if (openGateGui) { pipe.gate.openGui(entityplayer); @@ -679,7 +679,7 @@ public class BlockGenericPipe extends BlockContainer { /** * Drops a pipe wire item of the passed color. - * + * * @param color */ private void dropWire(IPipe.WireColor color, World world, int i, int j, int k) { @@ -789,14 +789,13 @@ public class BlockGenericPipe extends BlockContainer { public static ItemPipe registerPipe(int key, Class clas) { ItemPipe item = new ItemPipe(key); - item.setItemName("buildcraftPipe." + clas.getSimpleName().toLowerCase()); - GameRegistry.registerItem(item, item.getItemName()); + item.setUnlocalizedName("buildcraftPipe." + clas.getSimpleName().toLowerCase()); + GameRegistry.registerItem(item, item.getUnlocalizedName()); pipes.put(item.itemID, clas); Pipe dummyPipe = createPipe(item.itemID); if (dummyPipe != null) { - item.setTextureFile(dummyPipe.getTextureFile()); item.setTextureIndex(dummyPipe.getTextureIndexForItem()); } diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 43b7e368..2a6eb09e 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -53,7 +53,7 @@ public class ItemFacade extends ItemBuildCraft { } @Override - public String getItemNameIS(ItemStack itemstack) { + public String getUnlocalizedName(ItemStack itemstack) { return "item.Facade"; } @@ -102,7 +102,7 @@ public class ItemFacade extends ItemBuildCraft { } catch (Exception e) { continue; } - + if (!(b.blockID == 20)){ if (b.blockID == 7 || b.blockID == 18 || b.blockID == 19 || b.blockID == 95) { continue; diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 4f0ca64f..635c2e78 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -53,8 +53,8 @@ public class ItemGate extends ItemBuildCraft { } @Override - public String getItemNameIS(ItemStack itemstack) { - return (new StringBuilder()).append(super.getItemName()).append(".").append(itemstack.getItemDamage()).toString(); + public String getUnlocalizedName(ItemStack itemstack) { + return (new StringBuilder()).append(super.getUnlocalizedName()).append(".").append(itemstack.getItemDamage()).toString(); } @SuppressWarnings("unchecked") diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 4376475a..06dfacc0 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -74,7 +74,7 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { } if (BlockGenericPipe.placePipe(pipe, world, i, j, k, blockID, 0)) { - Block.blocksList[blockID].onBlockPlacedBy(world, i, j, k, entityplayer); + Block.blocksList[blockID].onBlockPlacedBy(world, i, j, k, entityplayer, itemstack); world.playSoundEffect(i + 0.5F, j + 0.5F, k + 0.5F, block.stepSound.getPlaceSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 71f43807..9c4e0aee 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -252,9 +252,8 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank renderState.facadeMatrix.setConnected(direction, blockId != 0 && Block.blocksList[blockId] != null); if (Block.blocksList[blockId] != null) { Block block = Block.blocksList[blockId]; - renderState.facadeMatrix.setTextureFile(direction, block.getTextureFile()); - renderState.facadeMatrix.setTextureIndex(direction, - block.getBlockTextureFromSideAndMetadata(direction.ordinal(), this.facadeMeta[direction.ordinal()])); + + // TODO } } diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index 1c2820cb..ff99ba6b 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -29,7 +29,6 @@ public class FacadeItemRenderer implements IItemRenderer { // Render Facade GL11.glPushMatrix(); - ForgeHooksClient.bindTexture(block.getTextureFile(), 0); block.setBlockBounds(0F, 0F, 1F - 1F / 16F, 1F, 1F, 1F); render.setRenderBoundsFromBlock(block); GL11.glTranslatef(translateX, translateY, translateZ); @@ -62,7 +61,6 @@ public class FacadeItemRenderer implements IItemRenderer { GL11.glPopMatrix(); // Render StructurePipe - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_BLOCKS, 0); block = BuildCraftTransport.genericPipeBlock; int textureID = 7 * 16 + 13; // Structure pipe block.setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos - 1F / 16F); diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 3ee581cc..3c6f63ea 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -180,7 +180,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if (state.facadeMatrix.isConnected(direction)) { ForgeHooksClient.bindTexture(state.facadeMatrix.getTextureFile(direction), 0); - state.currentTextureIndex = state.facadeMatrix.getTextureIndex(direction); + state.currentTextureIndex = state.facadeMatrix.getTextureIcon(direction); // Hollow facade if (state.pipeConnectionMatrix.isConnected(direction)) { diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index a16a129f..5b325da5 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -437,7 +437,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glTranslatef((float) d, (float) d1, (float) d2); GL11.glTranslatef(0, 0.25F, 0); GL11.glScalef(renderScale, renderScale, renderScale); - dummyEntityItem.func_92058_a(itemstack); + dummyEntityItem.setEntityItemStack(itemstack); customRenderItem.doRenderItem(dummyEntityItem, 0, 0, 0, 0, 0); GL11.glPopMatrix(); } diff --git a/common/buildcraft/transport/utils/FacadeMatrix.java b/common/buildcraft/transport/utils/FacadeMatrix.java index 5660dcf0..fcfea0cf 100644 --- a/common/buildcraft/transport/utils/FacadeMatrix.java +++ b/common/buildcraft/transport/utils/FacadeMatrix.java @@ -4,38 +4,25 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; public class FacadeMatrix extends ConnectionMatrix { - private String[] _textureFiles = new String[ForgeDirection.VALID_DIRECTIONS.length]; - private int[] _textureIndex = new int[ForgeDirection.VALID_DIRECTIONS.length]; + private Icon[] _textureIcons = new Icon[ForgeDirection.VALID_DIRECTIONS.length]; private boolean dirty = false; public FacadeMatrix() { - for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - _textureFiles[direction.ordinal()] = ""; - } } - public String getTextureFile(ForgeDirection direction) { - return _textureFiles[direction.ordinal()]; + + public Icon getTextureIcon(ForgeDirection direction) { + return _textureIcons[direction.ordinal()]; } - public void setTextureFile(ForgeDirection direction, String filePath) { - if (!_textureFiles[direction.ordinal()].equals(filePath)) { - _textureFiles[direction.ordinal()] = filePath; - dirty = true; - } - } - - public int getTextureIndex(ForgeDirection direction) { - return _textureIndex[direction.ordinal()]; - } - - public void setTextureIndex(ForgeDirection direction, int value) { - if (_textureIndex[direction.ordinal()] != value) { - _textureIndex[direction.ordinal()] = value; + public void setTextureIcon(ForgeDirection direction, Icon value) { + if (_textureIcons[direction.ordinal()] != value) { + _textureIcons[direction.ordinal()] = value; dirty = true; } } @@ -55,8 +42,7 @@ public class FacadeMatrix extends ConnectionMatrix { public void readData(DataInputStream data) throws IOException { super.readData(data); for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) { - _textureFiles[i] = data.readUTF(); - _textureIndex[i] = data.readInt(); + _textureIcons[i] = data.readInt(); } } @@ -65,7 +51,7 @@ public class FacadeMatrix extends ConnectionMatrix { super.writeData(data); for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) { data.writeUTF(_textureFiles[i]); - data.writeInt(_textureIndex[i]); + data.writeInt(_textureIcons[i]); } } } From df26c32121817ba90f26640fa3566d64eaae209a Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 7 Mar 2013 00:31:35 -0500 Subject: [PATCH 02/93] Huge amount of fixes. Still a LOT to go. --- .../textures/blocks/blockBlueLaser.png | Bin 0 -> 843 bytes .../textures/blocks/blockDrillHeadTexture.png | Bin 0 -> 709 bytes .../textures/blocks/blockDrillTexture.png | Bin 0 -> 384 bytes .../textures/blocks/blockFillerSides.png | Bin 0 -> 660 bytes .../textures/blocks/blockFillerTopOff.png | Bin 0 -> 684 bytes .../textures/blocks/blockFillerTopOn.png | Bin 0 -> 688 bytes .../buildcraft/textures/blocks/blockFrame.png | Bin 0 -> 402 bytes .../textures/blocks/blockMarker.png | Bin 0 -> 406 bytes .../textures/blocks/blockPathMarker.png | Bin 0 -> 398 bytes .../textures/blocks/blockPathMarkerActive.png | Bin 0 -> 407 bytes .../textures/blocks/blockPlainPipe.png | Bin 0 -> 407 bytes .../textures/blocks/blockRedLaser.png | Bin 0 -> 829 bytes .../textures/blocks/blockStripesLaser.png | Bin 0 -> 728 bytes .../textures/blocks/blockTransparentLaser.png | Bin 0 -> 356 bytes .../buildcraft/textures/blocks/block_0_10.png | Bin 0 -> 769 bytes .../buildcraft/textures/blocks/block_0_11.png | Bin 0 -> 1075 bytes .../buildcraft/textures/blocks/block_0_12.png | Bin 0 -> 803 bytes .../buildcraft/textures/blocks/block_0_13.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_0_14.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_0_15.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_0_4.png | Bin 0 -> 810 bytes .../buildcraft/textures/blocks/block_0_5.png | Bin 0 -> 903 bytes .../buildcraft/textures/blocks/block_0_6.png | Bin 0 -> 760 bytes .../buildcraft/textures/blocks/block_0_7.png | Bin 0 -> 984 bytes .../buildcraft/textures/blocks/block_0_8.png | Bin 0 -> 748 bytes .../buildcraft/textures/blocks/block_0_9.png | Bin 0 -> 970 bytes .../buildcraft/textures/blocks/block_10_0.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_1.png | Bin 0 -> 368 bytes .../textures/blocks/block_10_10.png | Bin 0 -> 369 bytes .../textures/blocks/block_10_11.png | Bin 0 -> 369 bytes .../textures/blocks/block_10_12.png | Bin 0 -> 369 bytes .../textures/blocks/block_10_13.png | Bin 0 -> 369 bytes .../textures/blocks/block_10_14.png | Bin 0 -> 369 bytes .../textures/blocks/block_10_15.png | Bin 0 -> 369 bytes .../buildcraft/textures/blocks/block_10_2.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_3.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_4.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_5.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_6.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_7.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_8.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_10_9.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_0.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_1.png | Bin 0 -> 368 bytes .../textures/blocks/block_11_10.png | Bin 0 -> 369 bytes .../textures/blocks/block_11_11.png | Bin 0 -> 369 bytes .../textures/blocks/block_11_12.png | Bin 0 -> 369 bytes .../textures/blocks/block_11_13.png | Bin 0 -> 369 bytes .../textures/blocks/block_11_14.png | Bin 0 -> 369 bytes .../textures/blocks/block_11_15.png | Bin 0 -> 369 bytes .../buildcraft/textures/blocks/block_11_2.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_3.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_4.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_5.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_6.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_7.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_8.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_11_9.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_0.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_1.png | Bin 0 -> 368 bytes .../textures/blocks/block_12_10.png | Bin 0 -> 369 bytes .../textures/blocks/block_12_11.png | Bin 0 -> 369 bytes .../textures/blocks/block_12_12.png | Bin 0 -> 369 bytes .../textures/blocks/block_12_13.png | Bin 0 -> 344 bytes .../textures/blocks/block_12_14.png | Bin 0 -> 344 bytes .../textures/blocks/block_12_15.png | Bin 0 -> 344 bytes .../buildcraft/textures/blocks/block_12_2.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_3.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_4.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_5.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_6.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_7.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_8.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_12_9.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_0.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_1.png | Bin 0 -> 368 bytes .../textures/blocks/block_13_10.png | Bin 0 -> 369 bytes .../textures/blocks/block_13_11.png | Bin 0 -> 369 bytes .../textures/blocks/block_13_12.png | Bin 0 -> 369 bytes .../textures/blocks/block_13_13.png | Bin 0 -> 369 bytes .../textures/blocks/block_13_14.png | Bin 0 -> 344 bytes .../textures/blocks/block_13_15.png | Bin 0 -> 344 bytes .../buildcraft/textures/blocks/block_13_2.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_3.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_4.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_5.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_6.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_7.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_8.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_13_9.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_0.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_1.png | Bin 0 -> 368 bytes .../textures/blocks/block_14_10.png | Bin 0 -> 369 bytes .../textures/blocks/block_14_11.png | Bin 0 -> 369 bytes .../textures/blocks/block_14_12.png | Bin 0 -> 369 bytes .../textures/blocks/block_14_13.png | Bin 0 -> 369 bytes .../textures/blocks/block_14_14.png | Bin 0 -> 369 bytes .../textures/blocks/block_14_15.png | Bin 0 -> 369 bytes .../buildcraft/textures/blocks/block_14_2.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_3.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_4.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_5.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_6.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_7.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_8.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_14_9.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_15_0.png | Bin 0 -> 370 bytes .../buildcraft/textures/blocks/block_15_1.png | Bin 0 -> 391 bytes .../buildcraft/textures/blocks/block_15_2.png | Bin 0 -> 411 bytes .../buildcraft/textures/blocks/block_15_3.png | Bin 0 -> 432 bytes .../buildcraft/textures/blocks/block_15_4.png | Bin 0 -> 443 bytes .../buildcraft/textures/blocks/block_15_5.png | Bin 0 -> 461 bytes .../buildcraft/textures/blocks/block_15_6.png | Bin 0 -> 473 bytes .../buildcraft/textures/blocks/block_15_7.png | Bin 0 -> 490 bytes .../buildcraft/textures/blocks/block_15_8.png | Bin 0 -> 505 bytes .../buildcraft/textures/blocks/block_15_9.png | Bin 0 -> 505 bytes .../buildcraft/textures/blocks/block_1_0.png | Bin 0 -> 423 bytes .../buildcraft/textures/blocks/block_1_1.png | Bin 0 -> 407 bytes .../buildcraft/textures/blocks/block_1_10.png | Bin 0 -> 431 bytes .../buildcraft/textures/blocks/block_1_11.png | Bin 0 -> 431 bytes .../buildcraft/textures/blocks/block_1_12.png | Bin 0 -> 424 bytes .../buildcraft/textures/blocks/block_1_13.png | Bin 0 -> 408 bytes .../buildcraft/textures/blocks/block_1_14.png | Bin 0 -> 453 bytes .../buildcraft/textures/blocks/block_1_15.png | Bin 0 -> 457 bytes .../buildcraft/textures/blocks/block_1_2.png | Bin 0 -> 407 bytes .../buildcraft/textures/blocks/block_1_3.png | Bin 0 -> 418 bytes .../buildcraft/textures/blocks/block_1_4.png | Bin 0 -> 423 bytes .../buildcraft/textures/blocks/block_1_5.png | Bin 0 -> 423 bytes .../buildcraft/textures/blocks/block_1_6.png | Bin 0 -> 430 bytes .../buildcraft/textures/blocks/block_1_7.png | Bin 0 -> 430 bytes .../buildcraft/textures/blocks/block_1_8.png | Bin 0 -> 430 bytes .../buildcraft/textures/blocks/block_1_9.png | Bin 0 -> 430 bytes .../buildcraft/textures/blocks/block_2_11.png | Bin 0 -> 541 bytes .../buildcraft/textures/blocks/block_2_12.png | Bin 0 -> 804 bytes .../buildcraft/textures/blocks/block_2_13.png | Bin 0 -> 472 bytes .../buildcraft/textures/blocks/block_2_14.png | Bin 0 -> 668 bytes .../buildcraft/textures/blocks/block_2_15.png | Bin 0 -> 627 bytes .../buildcraft/textures/blocks/block_2_3.png | Bin 0 -> 723 bytes .../buildcraft/textures/blocks/block_2_4.png | Bin 0 -> 504 bytes .../buildcraft/textures/blocks/block_2_5.png | Bin 0 -> 552 bytes .../buildcraft/textures/blocks/block_2_6.png | Bin 0 -> 507 bytes .../buildcraft/textures/blocks/block_2_7.png | Bin 0 -> 643 bytes .../buildcraft/textures/blocks/block_2_8.png | Bin 0 -> 541 bytes .../buildcraft/textures/blocks/block_2_9.png | Bin 0 -> 503 bytes .../buildcraft/textures/blocks/block_3_0.png | Bin 0 -> 510 bytes .../buildcraft/textures/blocks/block_3_1.png | Bin 0 -> 394 bytes .../buildcraft/textures/blocks/block_3_12.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_3_13.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_3_14.png | Bin 0 -> 633 bytes .../buildcraft/textures/blocks/block_3_15.png | Bin 0 -> 890 bytes .../buildcraft/textures/blocks/block_3_2.png | Bin 0 -> 395 bytes .../buildcraft/textures/blocks/block_3_3.png | Bin 0 -> 414 bytes .../buildcraft/textures/blocks/block_3_4.png | Bin 0 -> 478 bytes .../buildcraft/textures/blocks/block_3_5.png | Bin 0 -> 683 bytes .../buildcraft/textures/blocks/block_3_6.png | Bin 0 -> 587 bytes .../buildcraft/textures/blocks/block_3_7.png | Bin 0 -> 646 bytes .../buildcraft/textures/blocks/block_3_8.png | Bin 0 -> 626 bytes .../buildcraft/textures/blocks/block_4_10.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_4_11.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_4_12.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_4_13.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_4_14.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_4_15.png | Bin 0 -> 368 bytes .../buildcraft/textures/blocks/block_4_9.png | Bin 0 -> 367 bytes .../buildcraft/textures/blocks/block_5_0.png | Bin 0 -> 378 bytes .../buildcraft/textures/blocks/block_5_1.png | Bin 0 -> 396 bytes .../buildcraft/textures/blocks/block_5_10.png | Bin 0 -> 450 bytes .../buildcraft/textures/blocks/block_5_11.png | Bin 0 -> 447 bytes .../buildcraft/textures/blocks/block_5_12.png | Bin 0 -> 460 bytes .../buildcraft/textures/blocks/block_5_13.png | Bin 0 -> 463 bytes .../buildcraft/textures/blocks/block_5_14.png | Bin 0 -> 463 bytes .../buildcraft/textures/blocks/block_5_15.png | Bin 0 -> 449 bytes .../buildcraft/textures/blocks/block_5_2.png | Bin 0 -> 408 bytes .../buildcraft/textures/blocks/block_5_3.png | Bin 0 -> 417 bytes .../buildcraft/textures/blocks/block_5_4.png | Bin 0 -> 428 bytes .../buildcraft/textures/blocks/block_5_5.png | Bin 0 -> 433 bytes .../buildcraft/textures/blocks/block_5_6.png | Bin 0 -> 437 bytes .../buildcraft/textures/blocks/block_5_7.png | Bin 0 -> 438 bytes .../buildcraft/textures/blocks/block_5_8.png | Bin 0 -> 447 bytes .../buildcraft/textures/blocks/block_5_9.png | Bin 0 -> 449 bytes .../buildcraft/textures/blocks/block_6_0.png | Bin 0 -> 407 bytes .../buildcraft/textures/blocks/block_6_1.png | Bin 0 -> 403 bytes .../buildcraft/textures/blocks/block_6_10.png | Bin 0 -> 410 bytes .../buildcraft/textures/blocks/block_6_11.png | Bin 0 -> 565 bytes .../buildcraft/textures/blocks/block_6_12.png | Bin 0 -> 713 bytes .../buildcraft/textures/blocks/block_6_13.png | Bin 0 -> 424 bytes .../buildcraft/textures/blocks/block_6_14.png | Bin 0 -> 457 bytes .../buildcraft/textures/blocks/block_6_15.png | Bin 0 -> 414 bytes .../buildcraft/textures/blocks/block_6_2.png | Bin 0 -> 389 bytes .../buildcraft/textures/blocks/block_6_3.png | Bin 0 -> 592 bytes .../buildcraft/textures/blocks/block_6_4.png | Bin 0 -> 445 bytes .../buildcraft/textures/blocks/block_6_5.png | Bin 0 -> 504 bytes .../buildcraft/textures/blocks/block_6_6.png | Bin 0 -> 567 bytes .../buildcraft/textures/blocks/block_6_7.png | Bin 0 -> 440 bytes .../buildcraft/textures/blocks/block_6_8.png | Bin 0 -> 412 bytes .../buildcraft/textures/blocks/block_6_9.png | Bin 0 -> 437 bytes .../buildcraft/textures/blocks/block_7_0.png | Bin 0 -> 413 bytes .../buildcraft/textures/blocks/block_7_1.png | Bin 0 -> 413 bytes .../buildcraft/textures/blocks/block_7_10.png | Bin 0 -> 405 bytes .../buildcraft/textures/blocks/block_7_11.png | Bin 0 -> 405 bytes .../buildcraft/textures/blocks/block_7_12.png | Bin 0 -> 402 bytes .../buildcraft/textures/blocks/block_7_13.png | Bin 0 -> 586 bytes .../buildcraft/textures/blocks/block_7_14.png | Bin 0 -> 877 bytes .../buildcraft/textures/blocks/block_7_15.png | Bin 0 -> 420 bytes .../buildcraft/textures/blocks/block_7_2.png | Bin 0 -> 413 bytes .../buildcraft/textures/blocks/block_7_3.png | Bin 0 -> 413 bytes .../buildcraft/textures/blocks/block_7_4.png | Bin 0 -> 413 bytes .../buildcraft/textures/blocks/block_7_5.png | Bin 0 -> 413 bytes .../buildcraft/textures/blocks/block_7_6.png | Bin 0 -> 404 bytes .../buildcraft/textures/blocks/block_7_7.png | Bin 0 -> 404 bytes .../buildcraft/textures/blocks/block_7_8.png | Bin 0 -> 404 bytes .../buildcraft/textures/blocks/block_7_9.png | Bin 0 -> 423 bytes .../buildcraft/textures/blocks/block_8_0.png | Bin 0 -> 539 bytes .../buildcraft/textures/blocks/block_8_1.png | Bin 0 -> 538 bytes .../buildcraft/textures/blocks/block_8_10.png | Bin 0 -> 438 bytes .../buildcraft/textures/blocks/block_8_11.png | Bin 0 -> 410 bytes .../buildcraft/textures/blocks/block_8_12.png | Bin 0 -> 432 bytes .../buildcraft/textures/blocks/block_8_13.png | Bin 0 -> 402 bytes .../buildcraft/textures/blocks/block_8_14.png | Bin 0 -> 449 bytes .../buildcraft/textures/blocks/block_8_15.png | Bin 0 -> 582 bytes .../buildcraft/textures/blocks/block_8_2.png | Bin 0 -> 544 bytes .../buildcraft/textures/blocks/block_8_3.png | Bin 0 -> 541 bytes .../buildcraft/textures/blocks/block_8_4.png | Bin 0 -> 440 bytes .../buildcraft/textures/blocks/block_8_5.png | Bin 0 -> 412 bytes .../buildcraft/textures/blocks/block_8_6.png | Bin 0 -> 437 bytes .../buildcraft/textures/blocks/block_8_7.png | Bin 0 -> 409 bytes .../buildcraft/textures/blocks/block_8_8.png | Bin 0 -> 440 bytes .../buildcraft/textures/blocks/block_8_9.png | Bin 0 -> 412 bytes .../buildcraft/textures/blocks/block_9_0.png | Bin 0 -> 449 bytes .../buildcraft/textures/blocks/block_9_1.png | Bin 0 -> 418 bytes .../buildcraft/textures/blocks/block_9_10.png | Bin 0 -> 447 bytes .../buildcraft/textures/blocks/block_9_11.png | Bin 0 -> 416 bytes .../buildcraft/textures/blocks/block_9_12.png | Bin 0 -> 442 bytes .../buildcraft/textures/blocks/block_9_13.png | Bin 0 -> 412 bytes .../buildcraft/textures/blocks/block_9_14.png | Bin 0 -> 443 bytes .../buildcraft/textures/blocks/block_9_15.png | Bin 0 -> 627 bytes .../buildcraft/textures/blocks/block_9_2.png | Bin 0 -> 446 bytes .../buildcraft/textures/blocks/block_9_3.png | Bin 0 -> 415 bytes .../buildcraft/textures/blocks/block_9_4.png | Bin 0 -> 449 bytes .../buildcraft/textures/blocks/block_9_5.png | Bin 0 -> 418 bytes .../buildcraft/textures/blocks/block_9_6.png | Bin 0 -> 446 bytes .../buildcraft/textures/blocks/block_9_7.png | Bin 0 -> 415 bytes .../buildcraft/textures/blocks/block_9_8.png | Bin 0 -> 449 bytes .../buildcraft/textures/blocks/block_9_9.png | Bin 0 -> 418 bytes .../textures/blocks/fillerPatterns/clear.png | Bin 0 -> 631 bytes .../blocks/fillerPatterns/fillAll.png | Bin 0 -> 634 bytes .../blocks/fillerPatterns/flatten.png | Bin 0 -> 637 bytes .../blocks/fillerPatterns/pyramid.png | Bin 0 -> 646 bytes .../textures/blocks/fillerPatterns/stairs.png | Bin 0 -> 647 bytes .../textures/blocks/fillerPatterns/walls.png | Bin 0 -> 641 bytes .../buildcraft/textures/items/block_0_0.png | Bin 0 -> 334 bytes .../buildcraft/textures/items/block_0_1.png | Bin 0 -> 817 bytes .../buildcraft/textures/items/block_0_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_0_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_0_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_0_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_0_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_0_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_0_2.png | Bin 0 -> 935 bytes .../buildcraft/textures/items/block_0_3.png | Bin 0 -> 444 bytes .../buildcraft/textures/items/block_0_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_0_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_0_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_0_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_0_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_0_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_10_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_10_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_10_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_10_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_10_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_10_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_10_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_10_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_11_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_11_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_11_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_11_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_11_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_11_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_11_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_12_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_12_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_12_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_12_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_12_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_12_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_12_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_13_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_13_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_13_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_13_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_13_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_13_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_13_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_14_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_14_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_14_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_14_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_14_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_14_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_14_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_15_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_15_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_15_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_15_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_15_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/block_15_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_15_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_1_0.png | Bin 0 -> 707 bytes .../buildcraft/textures/items/block_1_1.png | Bin 0 -> 944 bytes .../buildcraft/textures/items/block_1_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_1_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_1_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_1_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_1_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_1_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_1_2.png | Bin 0 -> 717 bytes .../buildcraft/textures/items/block_1_3.png | Bin 0 -> 845 bytes .../buildcraft/textures/items/block_1_4.png | Bin 0 -> 895 bytes .../buildcraft/textures/items/block_1_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_1_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_1_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_1_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_1_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_2_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_2_1.png | Bin 0 -> 471 bytes .../buildcraft/textures/items/block_2_10.png | Bin 0 -> 581 bytes .../buildcraft/textures/items/block_2_11.png | Bin 0 -> 581 bytes .../buildcraft/textures/items/block_2_12.png | Bin 0 -> 581 bytes .../buildcraft/textures/items/block_2_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_2_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_2_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_2_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_2_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_2_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_2_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_2_6.png | Bin 0 -> 567 bytes .../buildcraft/textures/items/block_2_7.png | Bin 0 -> 580 bytes .../buildcraft/textures/items/block_2_8.png | Bin 0 -> 580 bytes .../buildcraft/textures/items/block_2_9.png | Bin 0 -> 580 bytes .../buildcraft/textures/items/block_3_0.png | Bin 0 -> 321 bytes .../buildcraft/textures/items/block_3_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_3_10.png | Bin 0 -> 592 bytes .../buildcraft/textures/items/block_3_11.png | Bin 0 -> 592 bytes .../buildcraft/textures/items/block_3_12.png | Bin 0 -> 592 bytes .../buildcraft/textures/items/block_3_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_3_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_3_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_3_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_3_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_3_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_3_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_3_6.png | Bin 0 -> 581 bytes .../buildcraft/textures/items/block_3_7.png | Bin 0 -> 591 bytes .../buildcraft/textures/items/block_3_8.png | Bin 0 -> 591 bytes .../buildcraft/textures/items/block_3_9.png | Bin 0 -> 591 bytes .../buildcraft/textures/items/block_4_0.png | Bin 0 -> 419 bytes .../buildcraft/textures/items/block_4_1.png | Bin 0 -> 416 bytes .../buildcraft/textures/items/block_4_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_4_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_4_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_4_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_4_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_4_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_4_2.png | Bin 0 -> 416 bytes .../buildcraft/textures/items/block_4_3.png | Bin 0 -> 413 bytes .../buildcraft/textures/items/block_4_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_4_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_4_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_4_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_4_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_4_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_5_0.png | Bin 0 -> 406 bytes .../buildcraft/textures/items/block_5_1.png | Bin 0 -> 420 bytes .../buildcraft/textures/items/block_5_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_5_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_5_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_5_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_5_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_5_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_5_2.png | Bin 0 -> 406 bytes .../buildcraft/textures/items/block_5_3.png | Bin 0 -> 420 bytes .../buildcraft/textures/items/block_5_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_5_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_5_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_5_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_5_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_5_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_6_0.png | Bin 0 -> 516 bytes .../buildcraft/textures/items/block_6_1.png | Bin 0 -> 522 bytes .../buildcraft/textures/items/block_6_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_6_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_6_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_6_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_6_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_6_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_6_2.png | Bin 0 -> 524 bytes .../buildcraft/textures/items/block_6_3.png | Bin 0 -> 514 bytes .../buildcraft/textures/items/block_6_4.png | Bin 0 -> 426 bytes .../buildcraft/textures/items/block_6_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_6_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_6_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_6_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_6_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_7_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_7_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_7_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_7_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_7_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_7_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_7_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_8_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_8_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_8_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_8_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_8_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_8_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_8_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_9_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_9_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_9_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_9_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_9_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/block_9_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/block_9_9.png | Bin 0 -> 329 bytes common/buildcraft/BuildCraftBuilders.java | 25 ++- common/buildcraft/BuildCraftCore.java | 41 ++-- common/buildcraft/BuildCraftEnergy.java | 4 +- common/buildcraft/BuildCraftFactory.java | 52 ++--- common/buildcraft/BuildCraftSilicon.java | 6 +- common/buildcraft/BuildCraftTransport.java | 30 +-- .../buildcraft/api/blueprints/BptBlock.java | 32 +-- .../buildcraft/api/bptblocks/BptBlockBed.java | 10 +- .../api/bptblocks/BptBlockDirt.java | 8 +- .../api/bptblocks/BptBlockDoor.java | 14 +- .../api/bptblocks/BptBlockLiquid.java | 8 +- .../api/bptblocks/BptBlockPiston.java | 8 +- common/buildcraft/api/core/BuildCraftAPI.java | 2 +- .../buildcraft/api/filler/IFillerPattern.java | 8 +- common/buildcraft/api/gates/Action.java | 18 +- common/buildcraft/api/gates/IAction.java | 9 +- common/buildcraft/api/gates/ITrigger.java | 11 +- common/buildcraft/api/gates/Trigger.java | 34 ++- .../buildcraft/builders/BlockArchitect.java | 25 +-- common/buildcraft/builders/BlockBuilder.java | 10 +- common/buildcraft/builders/BlockFiller.java | 30 ++- common/buildcraft/builders/BlockMarker.java | 29 ++- .../buildcraft/builders/BlockPathMarker.java | 31 ++- .../buildcraft/builders/BptBlockFiller.java | 2 +- .../builders/BuilderProxyClient.java | 22 +- common/buildcraft/builders/FillerFillAll.java | 13 +- .../builders/FillerFillPyramid.java | 13 +- .../buildcraft/builders/FillerFillStairs.java | 13 +- .../buildcraft/builders/FillerFillWalls.java | 13 +- .../buildcraft/builders/FillerFlattener.java | 13 +- common/buildcraft/builders/FillerPattern.java | 11 +- common/buildcraft/builders/FillerRemover.java | 13 +- common/buildcraft/builders/TileBuilder.java | 2 +- common/buildcraft/builders/TileMarker.java | 4 +- .../buildcraft/builders/gui/GuiBuilder.java | 9 +- common/buildcraft/builders/gui/GuiFiller.java | 14 +- .../buildcraft/builders/gui/GuiTemplate.java | 5 +- common/buildcraft/core/BlockSpring.java | 23 +- .../core/BuildCraftConfiguration.java | 14 +- common/buildcraft/core/EntityBlock.java | 10 +- common/buildcraft/core/EntityRobot.java | 4 +- common/buildcraft/core/TileBuildCraft.java | 12 ++ common/buildcraft/core/Version.java | 20 +- .../core/gui/GuiAdvancedInterface.java | 19 +- common/buildcraft/core/gui/GuiBuildCraft.java | 15 +- .../core/proxy/CoreProxyClient.java | 11 +- .../core/render/RenderEntityBlock.java | 202 ++---------------- .../buildcraft/core/render/RenderLaser.java | 2 +- .../buildcraft/core/render/RenderRobot.java | 2 +- .../core/render/RenderingMarkers.java | 11 +- .../core/triggers/TriggerInventory.java | 2 +- .../core/triggers/TriggerLiquidContainer.java | 2 +- .../core/triggers/TriggerMachine.java | 2 +- common/buildcraft/core/utils/BlockUtil.java | 2 +- .../core/utils/SidedInventoryAdapter.java | 18 +- .../core/utils/SimpleInventory.java | 14 ++ .../core/utils/SurroundingInventory.java | 14 ++ common/buildcraft/core/utils/Utils.java | 7 +- common/buildcraft/energy/BlockOilFlowing.java | 12 +- common/buildcraft/energy/BlockPollution.java | 19 +- common/buildcraft/energy/BptBlockEngine.java | 2 +- .../buildcraft/energy/OilBucketHandler.java | 2 +- common/buildcraft/energy/OilPopulate.java | 12 +- .../buildcraft/energy/TriggerEngineHeat.java | 2 +- .../energy/render/RenderEngine.java | 6 +- common/buildcraft/factory/BlockFrame.java | 37 ++-- .../buildcraft/factory/BlockMiningWell.java | 4 +- common/buildcraft/factory/BlockPlainPipe.java | 19 +- common/buildcraft/factory/BlockQuarry.java | 6 +- common/buildcraft/factory/BlockRefinery.java | 10 +- common/buildcraft/factory/BptBlockTank.java | 2 +- .../factory/EntityMechanicalArm.java | 14 +- common/buildcraft/factory/FactoryProxy.java | 17 ++ .../factory/FactoryProxyClient.java | 40 +++- .../buildcraft/factory/TileAutoWorkbench.java | 26 ++- common/buildcraft/factory/TileMiningWell.java | 2 +- common/buildcraft/factory/TilePump.java | 6 +- common/buildcraft/factory/TileQuarry.java | 2 +- .../factory/gui/ContainerAutoWorkbench.java | 2 +- .../factory/gui/GuiAutoCrafting.java | 5 +- common/buildcraft/factory/gui/GuiHopper.java | 5 +- .../buildcraft/factory/gui/GuiRefinery.java | 5 +- .../factory/render/RenderHopper.java | 4 +- .../factory/render/RenderRefinery.java | 8 +- .../buildcraft/factory/render/RenderTank.java | 11 - .../silicon/BlockAssemblyTable.java | 5 +- .../TileAssemblyAdvancedWorkbench.java | 14 ++ .../buildcraft/silicon/TileAssemblyTable.java | 14 ++ .../gui/GuiAssemblyAdvancedWorkbench.java | 5 +- .../silicon/gui/GuiAssemblyTable.java | 5 +- .../transport/BlockGenericPipe.java | 45 ++-- common/buildcraft/transport/ItemPipe.java | 2 +- common/buildcraft/transport/Pipe.java | 16 +- .../buildcraft/transport/PipeRenderState.java | 4 +- .../transport/PipeTransportPower.java | 2 +- .../transport/blueprints/BptItemPipeIron.java | 2 +- .../blueprints/BptItemPipeWooden.java | 2 +- .../transport/gui/GuiDiamondPipe.java | 5 +- .../transport/gui/GuiEmeraldPipe.java | 5 +- .../transport/gui/GuiGateInterface.java | 40 ++-- .../transport/pipes/PipeItemsEmerald.java | 16 +- .../transport/pipes/PipeItemsObsidian.java | 9 +- .../transport/pipes/PipeLogicDiamond.java | 14 ++ .../transport/pipes/PipeLogicIron.java | 4 +- .../transport/pipes/PipeLogicWood.java | 2 +- .../transport/render/PipeWorldRenderer.java | 39 ++-- .../transport/render/RenderPipe.java | 8 - .../triggers/TriggerPipeContents.java | 2 +- .../transport/triggers/TriggerPipeSignal.java | 2 +- .../triggers/TriggerRedstoneInput.java | 2 +- 616 files changed, 777 insertions(+), 765 deletions(-) create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockBlueLaser.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillHeadTexture.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillTexture.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerSides.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerTopOff.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerTopOn.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockFrame.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockMarker.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarker.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarkerActive.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockPlainPipe.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockRedLaser.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockStripesLaser.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/blockTransparentLaser.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_15_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_1_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_2_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_5_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_6_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_7_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_8_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_9_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/clear.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/fillAll.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/flatten.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/pyramid.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/stairs.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/walls.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_9.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockBlueLaser.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockBlueLaser.png new file mode 100644 index 0000000000000000000000000000000000000000..e048b52dd5e30a62f66305668fd4698b536a74ab GIT binary patch literal 843 zcmZ`#dq~q!6h3pCk4>FZ(>Y)B{X+XqEo;5dCUffM(t(TsIfSoi! zoQm0DJ*?@7!Qq@VOpL-G1o;W6G5~!bKy3rSGFr7C z0V*kg&$$4iW&qc+mIr&bV_{X1tc(Zv=IKcQ{Zv@9~*no1F$0Kw)@$w?h&M4OaX8rw*kc
  • IZB*0q-2PE?V?*Udg9OCPXa>~z-Fqy>02KgdB8i4Tm#M+v$ zSm=E5@IYJumO14k6~FB?wCGWX3P}%Xh)*YZ|kb>AH3GdrrqiZ zy`S9ph1F-}W;#-=ZQH%0>P3#<#AAuYt4@9YZ72Oigdw`@z?SNkeZq_8fs~#1&fcUa zRQk7xd!?C;m#5<1>AN?xCoU`+4VSWh)8{lPvW-chH-yHvV_~-C{2|Wl(V7**;U)Jo zi}KSMysCZX`Sga8HO`2^$Jn}LY{Fj%(8Xuy3RF6^D8F2d2_h+BR5&FJkEE2sND&n& ziblCfL{a8!RmMLJ#ia#BnyUXdw9rg5*uY)ipefR-OH{>bkq!w^Il?}Ry1Q89uNTuw oHM+y9ay2MaMJ2ijdAw3^C@Nx8gpi^Z%3JXkNaN+=_PE^ozhUw#)&Kwi literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillHeadTexture.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockDrillHeadTexture.png new file mode 100644 index 0000000000000000000000000000000000000000..e424b8178981456c66b036c8cb585c6fe2a4664e GIT binary patch literal 709 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lvoDF7xOkFb-YGxz-+7l9nk0*}aI1_o{+ z5N5n|x9$&6@RX;EV~E6M-Tv1_%?=!HFIA=1uG}{a`+%f4^Oz0JqFXzQ(W(>JIuT9C^lDK78zqPb78FhV!l>8J<~ zd+N;()hmKJ1TU_MSbgx(FV%~i?k-?UjCrxgwf@3l9gUCkAHU>LPEX-GGe=06&)`|+ zsY#nXCZ*hRU$K0uj^@n6FJDG73r=l0xz}WRIIj_V;QTwcf9K7!|Dq9Ddv4de;&?)FK#IZ0z|dINz);u7 zAjHtf%D~9V1jseDGB9`>lNf=bAvZrIGp!Q0hB=Hkp8z!ofow?2%t_5l%uTf_0Wuhj z;tdUI!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&cxC1BZ`~&;S4b=gCg^2NYyX@^*J&O5?6c0jVhPh%9Dc;1&X5#!GkW{s0A)JY5_^ zIIbrrFfd+gxDdeRD6XKW#H4&6W&?{vM;k+A3n#<(r+k)^7;{~Ls#Qx|BT7;dOH!?p zi&B9UgOP!uv95uku8~2Ap^=q=k(CLMYiea+@HQqf0!2e^eoAIqC2kFK7;ioSY7hk3 zkd~Q~nwOZHYE=ScFc`%fo@ooc0hE*iNe1Vqm6RtIr7{F0X6BXX`MHKDlo{)p>KPgs Td?{K8RK?)w>gTe~DWM4fL;z@! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerSides.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockFillerSides.png new file mode 100644 index 0000000000000000000000000000000000000000..a870fa6f793c9788278ec236272416778a42d60d GIT binary patch literal 660 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lvo|$ z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QMu2ba{T==*v@wbNeLE?vwcZ#QxoV z%O_X#pWiV4_1g8v3+JD&TyLCEesR;}(_`DyyT!gecY1h9=kgKx*SF2yKd^pw-SGT= zsndJJKRmR#e?j}zZPV9x%r701y?ajc!3FLA|Nk#8b6*B@E@P6nyNksF_NCW=9L@rd z$YKTtZXpn6ymYtj4^VK5r;B5V#O36K156S#XGA)fXiHnOcRYLY=o#b1H+yRSC`2{* z2XMG>8+UaynRaw~FPNpE$*Q#UXsXKsrcDX8MNOX+q8PPStXQ&!X;J9S1xz_M3B^|< zZXS%0WGm%pj`U)7$;>j$Xuf-N!D8-3tzWJrh`nm|WVYSl*>>pB9DzjTWPz0_O3V2| z)49r~FOs}r|7=DaJHy;|4g=Z!jg>(6sg}4#l%yn45bDP46hOx7_4S6Fo+k-*%fF5l-M5N z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQ{%gfW!(tf^l zd3;&#*%r&uLserqI&TvSGu9Y15|tcMToR{K$5V<>msBkcJJ7AF zC9V-ADTyViR>?)FK#IZ0z|dINz);u7AjHtf%D~9V1jseDGB9`>lNf=bAvZrIGp!Q0 zhB=Hkp8z!of^103%t_5l%uTf_0Wug&;tfx5Yi0o@r9hIw`DrEPiAAXl0g0J;C3=3Y dAqr*2dZv1Y1_ob>76Mf45bDP46hOx7_4S6Fo+k-*%fF5l-L#E z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQ{%gfW!(tf^l zd3;&#8P1$J^XakOn>*%r&uLserqI&TvSGu9Y15|tcXirvLO>_xAWKsXGGq z)ppw+U1YgorC0x??*_k)9I{MZ&K>jl#_hRTe}1g{_hj!P@w>|R_Ajqz2wTp*OXStb zFrZ^qOI#yLQW8s2t&)pUffR$0fuXUkfuXLEL5QJ|m4T6!36N`QWnl0&CNTmKLZB)JPgg&ebxsLQ06BXXcK`qY literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockFrame.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockFrame.png new file mode 100644 index 0000000000000000000000000000000000000000..ca76680bbaca0178c12fbb85166b73a87afc5248 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#<|8L;<|Np?)FK#IZ0z|dINz);u7AjHtf%D~9V1jseDGB9`>lNf=bAvZrI zGp!Q0hB=Hkp8z!of^103%t_5l%uTf_0Wuhj;*CQ4S(1Q~QXt9T{Irtt#G+J&fW*wa h5hJyShH1A{L`3xTQ_JYD@<);T3K0RS*RYcl`< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockMarker.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockMarker.png new file mode 100644 index 0000000000000000000000000000000000000000..b1f37399f49c232a301d645b243dd285e888b19b GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+A80f#F(c=>Px!K`bD3>QV6tAd9gi$S;_|;n|He5GTpo-G%i>{>$S)4rhT!WHAE+ zw-5+3UbEal|aXmRfLEM1LLDH$~1!C8<`)MX5lF!N|bSSl7T%*T^8m(8$Wb$jSuBHMKG@cpH-#fubQd zKP5A*61Rpqj5nVEH3))iNXyJg%}dNpwJHHJ7>wgB56|Cz7bqzOk_^sID=AMbN@WO0 j%*-p%^K%VRC^ObG)iX3O_)@eGsEWbU)z4*}Q$iB}q;Ydm literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarker.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockPathMarker.png new file mode 100644 index 0000000000000000000000000000000000000000..65d971867c22454eb6b4f516e4bfc9764f464eed GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+A80A)Vp>e-Qou|NqEnk4_+qu_VYZn8D%MjWiG^$=lt9r9b0lAdtgZ;1OBOz`!j8 z!i<;h*8Kqr%6PgshHzX@PFNsez_q}5hDZVrvqrPzxqt)f*%);1GlnpW{_Fs%Q!R0g zC`m~yNwrEYN(E93Mh1q)x(0^2Mg}2t8~aAa}Hcc82kNH#b>t)x7$D3u`~F*C13&(AeP bq0Cs%RL{`B;7id$pehDWS3j3^P6=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+A80A)SHYKg0k3Am;!7|7&(N#{pT4B|(0{3=Yq3q=7g|-tI1}Kk{E52XZ(IJR*x3 z7`TN%nDNrxx<5ccB~KT}5RU7~2@2u{Tn>^>T`zcch-_w_a*!!q;=mG~4XYR#eB&Aa zv6hK#0;*Omag8WRNi0dVN-jzTQVd20hQ_)EhPp-uA%;d)21ZsUK(48kfx+9D#0V4( zx%nxXX_dG&%wfFw1gJp>WJ6kJPHJ9aZmLxYkilRaZ)muANk}44Rth8=oS#-wo>-L1 l5RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIH9RaHs$P literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockPlainPipe.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockPlainPipe.png new file mode 100644 index 0000000000000000000000000000000000000000..05940b37de1bb4e8138187e4e40a0b0826eccd4c GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+A0?KK~my{sXxT|AD}BL9iW=$(ZEr?!wZaaWfFe;VkfoEM{Qf76M_$OLy!300oUb zT^vI=t|uoX2qYw>r7$q+@UR*<3vfC3u%0M-C#jM5}+OtG9OCgNyMi9f- z7t9mC)jgdI)UI0M8c~vxSdwa$T$Bo=7>o=IjdcwSb&U){42`S|jI2z6TvICpgSRn> z5hxmR^HVa@DsgL=!+7%vP=g@IhP2F_)V##pRI3sogTW}?V0UAxA5c;XBpIBaR#Ki= nl*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP!)rxtDnm{r-UW|@cVGr literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockRedLaser.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockRedLaser.png new file mode 100644 index 0000000000000000000000000000000000000000..98da7c67215f640bf095d0bc296476d647cf8dcf GIT binary patch literal 829 zcmZ`$NlcSb5T3SdrIdXs1q@J@g3|mgVoWiC5-LS4A~Y2P1PZiBSOW!@gAznU4+Sv> zLO^XW@qj`qi6X=Z8iUb@22?;Pf`II(h=5vn4&FR?c;9^Ad^7Vh?_G?Ki(y-HtpR`? zD~nFRXuo}|7>N83yF?6T*%G+~z)-_7smxK+N)lqCpsn9?4uyB7EI|%%Isl-&65to6 z%4Y#eDS-KO0C59=TTxTjk$q@%QCKxDJOBL)V32Ka=;-JLL*#MhSu1P~ve3CuV- z5r2Qe=Mx@}xVaH?bK>Pi938jN0{9K^4T-DkD!@-948}O3hsP44ogLwDJ|OY-COdYR z048w*l=k+-%#3ikBsh2zm&A;x=SP5LfGOlbLB!daSXj&;x3M9Fyy$XJ;_kGJgE7&E z3pA2g6wD&ou@V55lBQJ1W1ja=%msE;dN}Xsis{DAsslG`7!-Y=<-y+l zK4JP>d2~ZvRcKk`%gLwR_f6H3XUbenN2*5G&0D{~Ynb;OIo>{{pKQK#*KB4`FgS2$ zw&Se6{SAA$bHMc0xTnBbce1V`!Yj-6YWOun$w7}S!gD3}WEqmJ9Nm+(l+EnY{8SjT3SCz@c8(1(AG@YBu5I~VY3w=I z!qG3f**@g)`lsmzd;@>2G)bGK(yGOo#cB*7qJ*I#lrTg@DTE?1B@*vO878Kvr4&`t zKMnbXSvi_h|8Hobjo|-)!}blDoIG`bDqk(uA^|E*q-4FeL6f^}CKhV6Csf61h*#wl eXa#Xng?Cw~AWR^nsMTUURza*ZF1jr$z2Xl;!7JDR literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/blockStripesLaser.png b/buildcraft_resources/mods/buildcraft/textures/blocks/blockStripesLaser.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4ca50f7786f6c7dc10af2e41974092909df544 GIT binary patch literal 728 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l(-t; z6XFV_&+L_Wa8c*!Rf8{29iCj#zkOQm!U5?^hvlvukw3Rz>d|H0>&KNYAC~*@!20Vm z$2(^=uAfjovq${xU5ghtjGtUJczjv!=S!EDw@mM!*SdX1{nT!;i-%-xo>Kkv*zV08 z^SkFXt{zi(cHQv&0qIw_O@F*}d4ApK+&;-~&z;^sus*v_;`0;xclRxCo>F;#-|G1d z<6o~`f4p%1`O5Xi3FU{EbY9#v`SjTK^lq^)PwX!rk-v0E_VsPED@PU1@0U8gNBqM> zoBJ2EU*9qR_T2IAIn4(bwC|nQ`v3p`t%zscK#wsddAqx~iSPRP7Rcc&@Q5sCVBi)4 zVa7{$>;3=**Lk`)hDcnNJs-*3=pe%SKv6Mdk#C^NQm1KLk(>Vg-+yH1=TEk0<`lm- z_-4P=>Uu-X=BsT^%WpR?Qu)5nNMcpMwUS-tCB-bd2jvcTKK6TfX7+i7&*F?3I~MXz z*Xh!nK0|xf<}~RUdF9m=6L`8(CwcANsS#{v!Zq{Nu7eY+HeH_iO-o-;rqYsiy=M91 z%5wjvsZX^+PT1FMs8wUVa&z^P@|Uy!eg0{5%D?t(V_M8#hR06)%d&V*%>%kzwZt`| zBqgyV)hf9t6-Y4{85kPt8W`#t8H5-bSs55vnE<(_Rt5%dV-h1!H00)|WTsW()-Z?h z<`bX>L68k;nK`L>iMgp(B|rv)LA!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM@oty!5+IMWz$3Dlfq`2Hgc&d0t@{HM<}luT0@NS~vLP)qCp9lIH`S^H$Y3ytH`u|tQ2{6^1(FQTPb(=; oEJ|evNX*PD(erZ+Q7ALkGu1ORF!)lm5U7g5)78&qol`;+0GMH0UH||9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_10.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ba3b94af594a37ce18437745161cbea09c611b GIT binary patch literal 769 zcmZ{hYfQ~y9LGOrWRyf(7hR?|n$1r8pHk*1bad2_Ql~Sj)#_B|)FDNVLa2qw)}-b3 zq8BckWu2mirsa0ljI~8Y93*$TyBFek^3Dq{e!uVYeZJ3kzwh%r2jgNRogKX#0cTBA zgjV3}$(lYz^aXO41OZdC!(+msvC?Tm?;yBrt2R0SK%1E0TVohAvg;!zyhOi8^-^wgSw?hZ#G0}E z*}}q%%~45P!O3;9WL>>`M1I;d5#c(|ZuKFX*2+xv+A39JS+1L-!_j(+yG4B@)gkG( zy(H?x&85|Mu4w#clvj8z-V!9!EOclNDN2sX9&v73z2wvW)1Tu`53ReuKCIU5$biZ{ z)Nxr@_eql~+WTT^s?68ELDMNu7>IWpammtUIY(|Ep4qxWGFmr|uaY-)_Ri`qvJMun zG*-Qq&D%BYMNL~qzokcO%l)2g^*TO!J;*=Ach}x|ElWQZhgSFHTn@{rZ1j29cw_lc z>VXp9`LQ+L9%;FAQY^NXE#f}&&FVyRmfmboW)>I(5GW~vL+rjUBv+vf_^Yf??fH=2v| k1qR~uraW^%tXk(+7!(j3ppc|51*gO*H0s!h23305A3DA8<^TWy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_11.png new file mode 100644 index 0000000000000000000000000000000000000000..48a98f40c8df24c5551e721d81eb5c815253cc69 GIT binary patch literal 1075 zcmZ{iYfO`86vzL#nQVrKQqR1O+QH z#!b0jwlOo3W#gh?2ZAGUVIP*bEmJ0|%RVg8afzBakvPpZ6ZZ0PANJuq|MP#&`Q;?% zd0Lf<>_Go0e*l3wvMe>LAzR`50(-`Cf;FtXXcEiCfTuIyIklbjJ`Q!Z1d}&*-)GHU zTBeo*b^8E!6Yw{C<-P}06Tkx00|*G) z3ZGlQHauq=cI0G)QVgv#E#F!BZH;2?tS(1}gonKv8u7|tS6|Nn)z#m7 zNU2p9b{ka%nx7Yc(l6fr(YusN2yPiu3sXsNGOeV&{5j?H%onqsE7LW0r{3jMRUCWfsCaNMJoe$n?|+QxuQS2)x!LN$q{T<8 zx9|5pG7ag3-PWG3SK>6Q9m4k7ze+HXmbqNVR)id~PzAB#0+fBWxFPq>8LbiLUWqf3{Zg literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_12.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1814f3deda5eab192e08a7c76cc387c8211bf3 GIT binary patch literal 803 zcmZ`#Yb@Jw6g@S2AVOrq%mgS#1qPs(Y|SI+2BC@knhR z@fMa1-NeL##cQ^VDV;|!HN>;=es{Wdzkb|@eYp4BbMHO5IX5#X(AU)1#u$L9AICeG zpt(Ly93lA}-7JKF;a$%FPoN>&M8i8uI4vpI*9$Va?J^;D(VXA_AjJ`oqyxW6OR@yq zrvOzXz$yT&5{p}|x)Ys2&=oFQr^DbNc6Tv0hO{(HOki>nDJfWA$I1#?TQM?%j0|jT zVRjacjaXQ~{yroU^!KB*6jM`p{TkoDqpuI;<*2B@=qP%7ad3dmO;lE5Z4K4cSX@L^ z6|`E^)Zp+CO-+c6MP?@CatsZjtqt|{SXx4JGxGDHR->f_3I%3nP*;b}PAo4YCkHAO z_VzG542=fU({Ojk+#Gs(kev;o5bf>Q*g#<+c6QL!h1yya7h`o5^YdtEKv5AoIv|rF zIT@*`=Lsh}!9=*~^k$>nrweWI(i4XUsY2w<9 zy{|ggkzQIJuy|_4iPm}MlA`?Vl$BLmt=Vm_Hl{7dBTBQEwO`>9y&d8pH3|vP7L+U{ zJ%98i%7}L@_QFqPm*B}8B})b`wf1Sm+`ykQ8}WMw*73(*8w_-cJ&O-T$0V zOniqY=Ch(jd;(xn3}-sUpff2hgUO!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_Ox BWitQ( literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_14.png new file mode 100644 index 0000000000000000000000000000000000000000..e340ceb06a2fda6b95c1c6ae57d8f3a939abbf86 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_>& BWq|+y literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_4.png new file mode 100644 index 0000000000000000000000000000000000000000..10f20c12aa852b73d338d51727dcf46a4a42494b GIT binary patch literal 810 zcmZ`#TS(J!6h8lpls8PvyijC>7Uag?sf&h}l!=#A<{YLe>C{<5UYfI|V2O0~MUWmu z1&tCdMDQUYr5i*~k<;mPbLw=;oX*SUbTc>q9Upt>;atA&JLmk)`MnZlr}}z@dI5lM zdYVv-@zk-Mq|jgC_~l}t?0Svc!yQCh7i8^s=G7SAbXGRcKmL|>uXp8`8ehTmh zspd6+dIn&<1VGRM5LDYeniGctE6S9l0Ly~K0+W+)cnAjv;Bb%|8x-bxJ)zT4EK6X) z)D*d}Kxs6vzD}|%>2T0U8VsY_DHpwLek};4F(byuv$r#inLlOoHI8EZa0nl%+6A%YPH1d zENHbPGA0v=Lzb2ZTwr5^u-n1uBuyqlucvWswHi=De{@8yu7XBGZ*9>w8-+I_+}oqg zW=gN8bUI>Uf@Rru@dqFL3ZnF8s!*~*z3fBaS({c+2jCrWY{caJV;7Q|bYYStSbe_D zoYx{c^DJ>HNVg0%cko9uUNGxqs4_rYPctBF@bGB=Cri|;I|lnG&n_ONi~lC#vwq25(qa2*8Z+D@?Jfit{E zITpMyT#=HmD3>Z^f-<=b1MrxrXbuy_;W3gZo`B&AVi3j(7-q9bn*UEjRZV$iMZ^Ca zx(V$HHuxXEP*HhbRxPcP2^5$BQyla4Uj20xLyyJWnhJ$dDwlysT3M~&W~WHP9!7Ix Vxls&bm%qU(NKeTY4keeg`~?n6TwVYG literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_5.png new file mode 100644 index 0000000000000000000000000000000000000000..d005abf66a0b47fd7fc3c6cd27647db0dfcc2905 GIT binary patch literal 903 zcmZ{hYfRH;6vltV3qnD~nV|#|)Pb6D`Im~adI4%Hv|KDu96C1mx3p5U7i;l;8#4%V z0Y=ndLR5k#YBFIF$pQ&v&JRW%VVW2(0+rIeWyytz+InQ~|dEN$V zL3U(#OgIo}&M_8=pE_of#>qK9X-cuU@$0hkv*7zC%{z61;E+v4*#^!I#{MoK&XH4; z58D%9?>=}dp}kL`Mu9&nK;H_{{U z&Kj9qGi}U5uKl|EofM2S8?$UPu21+e%ut&-ouP~hZS6!|xS^%0I?)+^WI^0;&s6t; zHNV{b_xaEc>Q&v6zSzN+wapLy?wV(59WoTIww&oHzwz5~yT9ae{fUGF7upN=8&>!p zH|1S%&D`JeU}Dw7@eS3_y1#pIs(54Mi@{#c_Tkxer$;VF?+Q!w+z;)Kby*@}R(24m z>09>Nb547tF(Pzs>(5U#o|z>-U5)SW?QhRCCw5)x%O8H_U4PPUb$#Ht*g5i#dyc>H zHBEzeww>|S_uT(z?as+@&%Gh06mR<0n!EP(n$jM9_dQ34?da3#17CGp-b89UMnbC- zjs-P`I@8Y|zIRK#_*cfjqk%nL_Jo_Ksun*JjpBo*(qN?;bm|=er#Mm-tu9H?CZ#Gi zZK_^L)h`s7rdO0d%T)R3{}DXCO1Ep<`w49!w;l>1YU~AF8NHI tl8hNk7W-VmEo#7tRdsuV$pt1`+-6;JTC!GAUIp5v3bU!ec-Bx+`yc!D`3L|2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_6.png new file mode 100644 index 0000000000000000000000000000000000000000..247b67ff34f356221cb4937150039ef15fba6df1 GIT binary patch literal 760 zcmZ{hdo0yq7{@=N71pFkS(>$q)sFp~sO>O~(K&>PGhvl;;v8eS>^Rl1$?CL5H7&K( z(jS@Bvd&6c_xo+8+@sv0gotvh3F-A`fAq)mexL9AJkQ?evo}8?T)D``*#=k?tO|@2 zx_B-YT8h(MW)~&ID#<_0A8r)dPHX22Z;=_P48UBo@~bee39862$X*9|CipF`^7>() z1OpmSoCT+h;(ObDMd5u!s5)p8M&S$0LK}RCS1=9dp%rdJqiBT7a1AOU8oogtjKDaQ zLJxd|3-A(}U;@Mfk_s_3}oS!oj#_(&G71Wil&!Q_6#+I(Rg! z=3LnEk&wK2n*jHyrLc@f&D~pTM^>C(nzOB8_|93cfs~S# zq$ekRQa>iyRfJTXkZ-OzXIxW%G$YRUp4Y1Cj!;A9GOMJSit@IrlP}^XEO%6O$GSX7 z9QJlwuNl*~4)3a4(Bn5KJEFba=UP#Y=w7yx?r|Q%{Ho0X-mo``S z_-yDsn1A?S$Rm5D>OzN|z*=hziZLc?jXFhwK_>*cK=VzNH#{{zJqAH<(yKlg$@d9N-_o2pY7MS>K+X}jLRQ52o$ic#r$;{mNf jM}#&x&FB#xq;}oE(Zk!rQf0zFu0;QwS zyc9l9g`Ioge{r<)8Elatv=($nVV3uJ_p*2R+n-2F{Bfq8Bv4R>+4U*b8o$3%g+-tbq&A312}eRDl+jz&2=s zJZOSLumBR^3vj}8s1OswZI}-yU^@s1?}M1cBbY#v7!j($3cVmEYX=K_2Fu_ZxCnP3 z6U?9hfuaO{gR^i1zJyIM8`i@)I0&(D9d1Gjd;oP2Aqrg(1Mh+ZEqPK9B5XZ$wOm=5v zdsrk)D$?gz5{Ab2)#vq@KKZ*>JD6YG&eQ+pFUF?&b067c@dRx zN)fIAz@&lqvNaWr{kB@0HCwad zN=L%eE79I5E!w8TH|Mu?G{p}EZMU3(q+h~rS=8UNX7=pKO*MBt)|MzOo%K^6c>2G) zs*U|Cd&|AcrU!8y<-LkPki`6ftc91WM+@8JD~-loKPW%hZBa-2UL?O7EPJVHUB6c` zZBus7geNsW9!Of!{HS-woL7XM8=W3^?b`*%Wy6n!V0xs3+q1z{Wv_JU{9=Pt`eCX)S^Q=a rBbUoJy8ShFp9_=SQ{`714Hji}x;jIxk)%=Iw<3!ogHhj}ySDB%m@N=G literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_8.png new file mode 100644 index 0000000000000000000000000000000000000000..5a898458a23a6ac2a230034a1b2e4fe010548535 GIT binary patch literal 748 zcmZ{gYfQ~?7{`CdT`FP8(yD!?v{Cz?lQtb@x|}*mEnSpQ9XhopMGjq4g{1^L@V0^L+R0`xHim2isUVS_vU+LiB-= z678m9&UBeQJm*JAn33ui<|jnWsdUO6QNnCg8Bg2Hqa~C52s1Uzo zD}Pvs{fZEyNkVAP2;s1&q<+&{Ip~ep7_9>fG(j`;!%OIdAJ7NmPy^TD1q{Pa_y}L1 z5sKgwOhPS~VGMGh1D?WnxC;*;8y-P9Jch4u8!kaHbip4Og&w#Dw_pS+pb#dY5}v>> zXooWBh5>jFub~cl;U0X3At-7oRy{lh^)RnD=`_a>%^ zfGXR#zGWl&F8gHb)0OTj?+?4`>>f_o`funDc-?+scFxh|nw-Vi>g}KItjKH#jj4J$ zSnC*)b+FWaT3%Vs<@j{7Pv1~X)cwr~S3O#-%;uKg9Gh?nuCQ&g?kIiN6Wdr3;CtZW z_vLR~)`i*Ty6gI#qz^ZfF3yx}Fd4Nwvy2jiMp1ivDr!%S60O!~6^(Y4q&`|j8Q*4z z`$w=lGdV3K_y2+tRrin-ESS2Gl9q1FFzhyJO|lS5;_90NzVe^KacUTqnPSQ|WEn+- iAuYq?6|ReRJ>c!-{0k*pLrx9q_lfYP$o?68u~XhPUCV#^|ZV^966Uv%+n~3TAj2mceU~1w(=ZBD(+@ zU==KYdO?82@FrBlb0EsMLJO3E24=$?=mODOB{ag*uompl2{mAW&0+}f!7lKEAJ%{o z)EMm^nhsi1*n5Jpb&&2V!UoKAsmDKkOmPr1k+(5*n|c!8I;fqFTo~w zA7pUD0Z_qqSPEL$16yD&1Rx5pKs%JclOU8%0tYm~>#z@k@GK;P9(IEo`r#e;5N5$P zcoz;sIn0D3LT6A2#UaGR#KidJrJ^2jtIBPbaH;R%r~t{0_G(dHkr}hNk!xGVMM7$s z#pG6=PdL+MjySXUUZGU=|CN>fL|)FJT_5!(DA&Z77pkUatB+eZjy?#dVRH3l7;>ih z`)6kCFh$Eh@XZ)LDCZY-do#~|`^CqO)h9Rg4OG09>8~B>&C(aE_tg!I<=r~${JQD) z&II!f>)`3`{jwAa92~09RUW@^?1#_O#zLMXLxc)Nnz3X;Ga8(yoS4% z<~YxG9=P_^=2KhSPOiM2E~z)#)TcK@jraBcl%_b&&A$c#zjGY4o@gYs(t9L)$ zTax|EiXX2=?0H+0!VjuWv?mr_iHzi~|HQbUAazAcjkz~Td9)$l{>#5z=CHB(o?`j) z3#+gGy6m^_uHPPg^eE9-IqTs!qj@ugTGM4~mF)A#euFpU7Y?1I)vG0~S|_=+I)kJ$ z%oecNAW8R@d&DpLA0gP_s}Hn3o)C>2yD116u@?gMYyImyLBBy32c(+0XU38{L{JqA pE@=qJVNb}9(^J1r);O&0+!np2SfiDsKSF&Xi!!UjGH9-i{0GID{}KQI literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_0.png new file mode 100644 index 0000000000000000000000000000000000000000..c55bf914f371f147ab3255d02e7aed99f79e28e5 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`JQ BWwQVP literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_10.png new file mode 100644 index 0000000000000000000000000000000000000000..6a5e23637827541c3008f8d3a25e8750bd90f948 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9&t;ucLK6TZ Csb)d| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_15.png new file mode 100644 index 0000000000000000000000000000000000000000..3dc1de944fbd7abe3be6bcf94233458b615c39f5 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9mdKI;Vst0G)DW ARsaA1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c732e93d73ae2754db00bf4c4cb418151f11de59 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_=` BWq$ww literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_5.png new file mode 100644 index 0000000000000000000000000000000000000000..d86028214c2a295ac827ce2fc3a1ced5ca7322e0 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`qZ BW$gd} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_8.png new file mode 100644 index 0000000000000000000000000000000000000000..c2b8447ec3e195da251c9ce3aa65e88a7e06238f GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>{YH BW>EkD literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_9.png new file mode 100644 index 0000000000000000000000000000000000000000..2340f733ee8539eb833ad80f0b92a49336ecb35e GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>__X BWrY9$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_1.png new file mode 100644 index 0000000000000000000000000000000000000000..882793a22f49eb7b1d30d92eba357624c6afdd4f GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9KLZB)JPgg&ebxsLQ0K1@N A<^TWy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_10.png new file mode 100644 index 0000000000000000000000000000000000000000..34dd4f74542d1180e3b6aea37a48a9b78fd116e9 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9&t;ucLK6To C)@F+U literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_13.png new file mode 100644 index 0000000000000000000000000000000000000000..21ece3cfc1dd84a8c46178651ebb6f2c04d41c56 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9jg>l$HWX2j{1ilqVLYG6W=M=9TFAxrQi|8S9zq85$UTDOw0r#o+1c=d#Wzp$PyF CqGj9w literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_14.png new file mode 100644 index 0000000000000000000000000000000000000000..235d13d8cc962020fdd5b606e32d4418aafa2497 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9&t;ucLK6Td Cv}RcV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_15.png new file mode 100644 index 0000000000000000000000000000000000000000..2a47e2c74cb7cba317ed13eaa5aa6f6d765933ad GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_`K BWsLv; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_4.png new file mode 100644 index 0000000000000000000000000000000000000000..0a112762b5d28b887836883c2f9b5ee3580b9081 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCII-% BXAuAZ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_6.png new file mode 100644 index 0000000000000000000000000000000000000000..4f03d839f7b25fc710bf08090d0a0b6e71c4ffa2 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9Rql>*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`P) BWxD_X literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_7.png new file mode 100644 index 0000000000000000000000000000000000000000..ef83a6eda70df81d7766deadcae2fe7fd1f4b3ad GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIF{T BWqtqv literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_9.png new file mode 100644 index 0000000000000000000000000000000000000000..519fa596d66efb8b0fd4aa19c157a1af9a3c9fa9 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR z+uenM@oty!5+IMWz$3Dlfq`2Hgc&d0t@{HM z<}luT0@NT3vLP)qCp9lIH`S^H$Y3xuiZ?V~CirkFP+AHk9h{$5Ql40p$`Fv4nOCCc e=Nh6=W~^tbXJ}yXrD!2g6@#a%pUXO@geCybu~_c_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_14.png new file mode 100644 index 0000000000000000000000000000000000000000..0e3f7355190717b93cb866f895ab2dcec184a4b9 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx?BpA#)4xIr~Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR z+uenM@oty!5+IMWz$3Dlfq`2Hgc&d0t@{HM z<}luT0@NT3vLP)qCp9lIH`S^H$Y3xuiZ?W|C@nDqN=t#HgY(l$$`gxH83GbB^Gfvm eTtgJfjP*?Q3=Isv6fFd*V(@hJb6Mw<&;$UaS6CVV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_15.png new file mode 100644 index 0000000000000000000000000000000000000000..a5bce43935b763494e4541744c9da42b5a27b0d3 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx?BpA#)4xIr~Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR z+uenM@oty!5+IMWz$3Dlfq`2Hgc&d0t@{HM z<}luT0@NT3vLP)qCp9lIH`S^H$Y3xuiZ?X%FLGG`l$HWX2j{1ilqVLYG6W=M=9TFA exrQi|8S9zq85$UTDOw0r#o+1c=d#Wzp$P!ACs=6! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c202b113502bf24a1062229067f7eda48ca169 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9zopr0Hru( Ab^rhX literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_3.png new file mode 100644 index 0000000000000000000000000000000000000000..2415a9e8ce9ac5c3c7a155fd91b8dc66fa9599b7 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9Bl>*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`ah BWyk;k literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_5.png new file mode 100644 index 0000000000000000000000000000000000000000..b8dabe6dffb2fd8d08b764cd9d59d3bb8ecaca9b GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_tR BWnKUP literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_1.png new file mode 100644 index 0000000000000000000000000000000000000000..42efb02cb46e7724b9e3c934b6013a5907359df2 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`Nk BWw`(V literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_10.png new file mode 100644 index 0000000000000000000000000000000000000000..60533c02794dafb22448db85e2bc02ee94a9510c GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ96E literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_14.png new file mode 100644 index 0000000000000000000000000000000000000000..a6099c2870ecf6787d778fe1d7a75a5202ac89a2 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx?BpA#)4xIr~Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR z+uenM@oty!5+IMWz$3Dlfq`2Hgc&d0t@{HM z<}luT0@NT3vLP)qCp9lIH`S^H$Y3xujyE)EI4K+ql$HWX2j{1ilqVLYG6W=M=9TFA exrQi|8S9zq85$UTDOw0r#o+1c=d#Wzp$P!DI9PK4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_15.png new file mode 100644 index 0000000000000000000000000000000000000000..3ebb90355d83fd2a042291a36a430fb53a423739 GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx?BpA#)4xIr~Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR z+uenM@oty!5+IMWz$3Dlfq`2Hgc&d0t@{HM z<}luT0@NT3vLP)qCp9lIH`S^H$Y3xujyE*@eopx)P+AHk9h{$5Ql40p$`Fv4nOCCc e=Nh6=W~^tbXJ}yXrD!2g6@#a%pUXO@geCy%h*@#~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_2.png new file mode 100644 index 0000000000000000000000000000000000000000..b9187b26b75b5f26ea5be68a7bec8fc017065c46 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9LQ!N`Yj9^V3So6N^$A0unRxO7#3(Llnx4^-T2)4Gg{%Ed;7!@O1TaS?83{1OSXk BWcL67 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_5.png new file mode 100644 index 0000000000000000000000000000000000000000..9afbb14a36e84e0ae29ff0b9f77a23f349f9de58 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_#l BWo`ff literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_6.png new file mode 100644 index 0000000000000000000000000000000000000000..f39e7d03eef5b9fb0d6da709314cabded33a290a GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ976Mf literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_7.png new file mode 100644 index 0000000000000000000000000000000000000000..c90445e3fdd8051c012e38ceb0a93952cff16432 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ90l>*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`CO BWuE{5 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_9.png new file mode 100644 index 0000000000000000000000000000000000000000..70ec0a99fec13615821a6b03eab32af3b9f617f4 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_?n BWq|+y literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_10.png new file mode 100644 index 0000000000000000000000000000000000000000..1fcc4ca132532d4baba048e0332cce4fb6f81413 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIAo$ BW#Iq- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_12.png new file mode 100644 index 0000000000000000000000000000000000000000..7dafd3163365c4b1afbfe62bd8c8b2fbec2822e6 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9N=t#HgY(l$$`gxH83GbB^GfvmTtgJfjP*?Q3=Isv6fFd*V(@hJb6Mw<&;$VE C;bjj1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_15.png new file mode 100644 index 0000000000000000000000000000000000000000..ea24f4d81f6e53f883001ed59234987e4f0b67ec GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_@2 BWr+X) literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_3.png new file mode 100644 index 0000000000000000000000000000000000000000..9ff58af10bf1d85694c3a52bc9036c5913a40045 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ976Mf!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`tm BW$6F_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_9.png new file mode 100644 index 0000000000000000000000000000000000000000..c03669f9b43c3182fbf40dbedb655b979d02c3ac GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIF*Q BWoiHb literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_0.png new file mode 100644 index 0000000000000000000000000000000000000000..c09260fc65cc21d5408d26d678d895ca7ccc0536 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o{+5N5n|x9$&6P~FqTF+}5h@}Ki38pI6@4S4KX_x$J3 z_;4WP(|keEwmj5;>Q(uQ3LwMYY5=q9i4;B-JXpC>2OC7#SEE>lzs9 z8X1Hb8d(__S(yO2rd9?9Z(|Z8P&DM`r(~v8;?^*S@#Yht1|g6QX_+~xd5O8HRwY0N zgQ01>!G$SH76WCaK(fL4X(i=}MX3w{iJ5sNdVa1U3T4K6rh0}3249L60#z}1y85}S Ib4q9e0ND3wr~m)} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_1.png new file mode 100644 index 0000000000000000000000000000000000000000..daddc6cdf96d859b4f9773a7a0f3972f3ae58c9f GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o{+5N5n|x9$&6(8klnF+}5h@}Ki38pI6@4S4ie_x#r| zJ=om%UB1oozvRTk6ZP}{EB>G8Dshpy>-+t5wK-u9YaCg7oE29v?q4ifckcBK9iTa? zC9V-ADTyViR>?)FK#IZ0z|dINz);u7AjHtf%D~9V1jseDGB9`>lNf=bAvZrIGp!Q0 zhB=Hkp8z!ofow?2%t_5l%uTf_0Wug2P2&xhPo825l$8R>2Ir@hlqVLYG6W=M=9TFA exrQi|8S9zq85$UTDOw0r#o+1c=d#Wzp$P!X6?BCF literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3b4dfd95b3b0b4f2b3a55b08afe22f1de8b11fd8 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o{+5N5n|x9$&6Fu>ErF+}5h@}Ki38pI6@4K9Q-zPHbc zJouYGQH*<23p?}s{pWr5{I{9F`rlaT@Pz+1|DFFScN;8X7XeCWT$}XD!{qnIos3ia zkMdsO)JS1qD9+W>_w(+(0W@2+#5JNMC9x#cD!C{XNHG{07#iyu80s1sgcurG85mia z0J)}C1_p0q5+hJFIjMPxxv5qqKn8=MX}po$tfT!v xSt*cgaDG}zd16s2LqK9?UWuNcYluRbv7V`(p@G4dqJ=p0*}aI1_o{+5N5n|x9$&6FxAt=F+}71*1(gz2Mjoj1Lq~`vz?e0 zyP*1M|L@GH!7rDa3h}4(q_#BaGJVi>to07q9@!M6UHE2-#cAm)jqa-zB^bU6`AIY= z>-Ys22^-(;>~UN<{oIdizK!?SJ)72Y?hfzI|B>PoObtzUJ+#>iv{1FgHKHUXu_VKYk@7#dj_7+IMBxu#YI25(~$BTzKt=BH$)RpQn#hwzopr0D@nJCIA2c literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_4.png new file mode 100644 index 0000000000000000000000000000000000000000..db398e8331825036f849e0690a77ca4cb1f88b15 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o{+5N5n|x9$&6u)x#BF+}71)QN#y42m2sroXmSmont< z6n_!-*ZQ~M#;21eI0<|{l9^=CI<-TuF-b9C%`eUm*O^!&4Du5;FkcHUcTkX+p0*}aI1_o{+5N5n|x9$&6u*uWKF+}71)WCy+hYdJ{?d%iv`6uY^ zcKCKm{;Ok*@ViMdYx@}$H|U7i%wzlGXuy8vZ1KA12?uIII8QYdDZ5%Kt1i|5xtMYO zwnv4b0dDN6i;cEu*tecEx4+fbxMXYE`FEB43YRJ`#@KQ04B-@)KhyZidHwlY?|V*V z-+L3VlCkplJN=Z}c8Ns>aa)0|Q7v(eC`m~yNwrEYN(E93Mh1q)x(0^2Mg}2p0*}aI1_o{+5N5n|x9$&6u+P)QF+}5hYrsLl!wNi`Ybp=L@i;6? zX?!zv|J8QpHkI7B{fvU*e1H;=#7%?IZyo@E7XNLr`rAWRob}r zgV{crn1c_bT~Zen3$olvJ1$?8wN0sgj#VZ{&EB%#Gbad0Bs~xFU$FcG50Bth`zc3H zi(Jw9thypJ&D^JF!KnqgyXr50h?AfFrpPk?arQZ&%T!BTBT7;dOH!?pi&B9UgOP!u zv95uku8~2Ap^=q=k(CLMYiea+@HQqf0!2e^eoAIqC2kFK7;ioSY7he1kd~Q~nwOZH zYE=ScFc_M~n^}HmoCcJY0?7vFrFVdQ&MBb@06k5b*#H0l literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_7.png new file mode 100644 index 0000000000000000000000000000000000000000..1702bfc836cb10aad4ed3241570b8f241610b4fb GIT binary patch literal 490 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o{+5N5n|x9$&6aK5LDV~EE2+5ktPBMKbebL76p+co^# z`u~&PHwVqU^z^R`NewC@AHQ$$Y2*LTYGE{!p>4gHOvGE(6OUdVR?m8t#o%%=<(1HG zpQP~VGX#_FFu0_d-?*}sant21q6!y}OqjV_e~nqqBdtZhFTB{6KC_}&qv>a=*NL@@ zypF0c=&U|`lJkMn%+e)_)@O^&|3-)H>r!!jP-1iFn`i%-xmT>~7zD1aw~zmOB^BsY z)e_f;l9a@fRIB8oR3OD*WMF8lYhb8rWDsI#WMyDvWdh`yS{WF;jY*6^(U6;;l9^VC zTf-d2n@@lmgg`c=W#**jCFZ7Dl>iwGhNki6ejf~hk_=KH+2H)NlJdl&REB`W%)Amk eKi3e2GGjecJwpS7FGUMM$~;~DT-G@yGywqgs-}Jb literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_8.png new file mode 100644 index 0000000000000000000000000000000000000000..38cf1b329b26ab6d0b89f25f1003126ebcfef39e GIT binary patch literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o{+5N5n|x9$&6aGj@%V~EE2*og-Pk1BAu$ouu(3g=P? zUDo*J>D|BVhZ6Snv9nA+-nFJ|`kBy;-fqiw?J~M4>aJ#;u;!*8gIt1+MdRd+Y0N3> z)~zTn{ps%BrlaS4P4w-iwLM2x?TZvUzk>6d8|ND%$paCcmbW9+`8Nw@i~F9D`t)@n zgYnc0Mwe{=ZUO_QmvAUQh^kMk%6JHu7RPhkwJ)|k(Ggwl?jk* zYGq*XHYPCwMMG|WN@iLmZVhu7Z$1HP5CYkdmYI{9mzbMsRRUx%7@Edg-1FC&2$Yoq v$p+`Am6RtIr7{F0X6BXX`MHKDlo{)p>KPgsd?{K8RK?)w>gTe~DWM4f@58J! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_15_9.png new file mode 100644 index 0000000000000000000000000000000000000000..b560449dd671e2ed45dcef5b1dcb14fe0dd12622 GIT binary patch literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpafHr zx4R3&|Mvbf`++>p0*}aI1_o{+5N5n|x9$&6aGj@%V~EE2(1`~nk1B99*Z--yvR9_T z?E)H}Q`}!WE^_jiuwjE-qNJ^eu&~&(i;La)>s8Y(GA6Gt%WII9kXAF0tTt76 zJ^7@)P2!j5L0f_rs2@#c3K!lwA*yGs>_yG}QcDx~Uo)=Olz+#5e@)x8U%&5HCVmXs zXX{nnsiyu+{_Rm$yCptb*F?&NPd>Qa=WOYzU)RI_c5i5JUHOYGtlIcx&51W(FI+P@ zzc&95W75NG+mE_Eo(FWfYKdz^NlIc#s#S7PDv)9@GB7mOH89jQG6*p=vNABTG68Z; ztqcs_#w13dXvob^$xN%ntzi!1%_l$&LLeK`GILV%5_40nN`MRoL(_Q6l^!zeKv^k} uY;b;BNqJ&XDnmeGW?qS&pKFLhnX#U!o}q!km!gG0RScf4elF{r5}E*7P_2Cc literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_0.png new file mode 100644 index 0000000000000000000000000000000000000000..99a6fda6291cb0d1ca6bcf06d725d1ea8d051f78 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#<_h-uf|NlQK>+?b&hp{BcFPOpM*^M+1C&}C0g(;1@CIzItz$3Dlfq`2Hgc&d0 zt@{HMwDELt4B@!0duAgqgCdXf#eB}HJY{7=2HxN6n-(h{oy=|hfYYZn^i4t03D30> z(>7c^Al3Sx>s{mz?R(R?b*kCBS*Ik)0L@V?ag8WRNi0dVN-jzTQVd20hQ_)EhPp-u zA%;d)21ZsUK(48kfx+9D#0V4(x%nxXX_dG&%wfFw1gJp}WJ6kJPHJ9aZmLxYkilRW zZ?NKa6i6~SKdq!Zu_%=xATcwqM9iwGhVh2y4!mvzN=ktwgY(l$ q$`gxH83GbB^GfvmTtgJfjP*?Q3=Isv6fFd*V(@hJb6Mw<&;$T=Vs|qD literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_10.png new file mode 100644 index 0000000000000000000000000000000000000000..22d584ce522f4d9a7de5e061d9cb24aca4cf5b1c GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#YW z%y{W;-5;Q!gQtsQ2*-8ZGaGps6nUI4&Of_}6TDx7Q@?Vl9f!*&g{~{Q`Y)siU=)+`omhWyLqC0L@Y@ag8WRNi0dVN-jzTQVd20 zhQ_)EhPp-uA%;d)21ZsUK(48kfx+9D#0V4(x%nxXX_dG&%wfFw1gJp>WJ6kJPHJ9a zZmLxYkilRWZ)lLWYE2DLRth8=oS#-wo>-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG) NgQu&X%Q~loCIAMpejfk; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_11.png new file mode 100644 index 0000000000000000000000000000000000000000..4215bd4f428dc2f9de5953687230718118f7f5ea GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#sGIRES>mb1JCLiad+IdcV1dQtFE>-GY^FCOIjMPx zxv5qqKn8*ARs=V?9$nLj!{^MGJwd O7(8A5T-G@yGywoMuYdjk literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_12.png new file mode 100644 index 0000000000000000000000000000000000000000..88a9b4e6957061ce34973ec0c0d6aab79cf10f5a GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#<*E7`r|Nr0X>j54hhp{BcFPOpM*^M+1C&}C0g(;1@CIzItz$3Dlfq`2Hgc&d0 zt@{HMwDELt4B@!0duAgqgCdXf#eB}HJY{7=2HxN6n-(h{oy=|hfYYZn^i4t03D30> z(>7c^Al3Sx>s{mz?R(R?b*kCBS*Ik)0L@V?ag8WRNi0dVN-jzTQVd20hQ_)EhPp-u zA%;d)21ZsUK(48kfx+9D#0V4(x%nxXX_dG&%wfFw1gJp>WJ6kJPHJ9aZmLxYkilRW zZ)nu8-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~lo FCIBX^c{l(7 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_13.png new file mode 100644 index 0000000000000000000000000000000000000000..27b709525cfad7dd11b7864ce2f4079640a56f1b GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0Q%R6t zFatx`bP0l+XkK#LRb; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_14.png new file mode 100644 index 0000000000000000000000000000000000000000..ffd652c7319ff4dcdb3d3c49f68b8da8f441eb27 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+A9B|00H07p?y9V)#Fc;s5{thGLT6fuf8hL4Lsu4$p3+fjCLt?k=o9@?RbYaySb- zB8wRqxP?HN@zUM8KS03%PZ!4!j_ba?7X=#(IGpG2U`Ur$n8&>(@4-LsuS$O>@N;-7 zI4t4~=l{kO^?<=UchC9SZHyC-E;#p`^U1S?TN5>NHbwp~HV$_c(B>9B@!>gV<7U>t zeF0~~fM%<}luT0@NS`vLP)qCp9lIH`S^H$Y3yxH#EsSo{*5I=ckpFCl;kL l1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>>eUi^>21 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_15.png new file mode 100644 index 0000000000000000000000000000000000000000..9af263b39c87a148bd2ef9a10be1f0a630949a67 GIT binary patch literal 457 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+A8WKT~#jp8V=c-6cip|NsBrvet4UP?WJG$S;_|;n|He5GTpo-G%i>{>$S)4rhT! zWHAE+w-5+3UbEal|aozRoMcxAn94r@Jvx&wsm^JKb*zn&^Yu1;2dissb z4sKntQg(id)PKml@t83&6_16NMh~s5DzZ)DzD!EHMM2>>4(1bRqbBFVdQ&MBb@0L~VPuK)l5 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_2.png new file mode 100644 index 0000000000000000000000000000000000000000..8b586b7bc0466c5fc17bc7f4e07a6c336cf76fff GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0Q%R6t zFatx`L68k;nK`L>iMgp(B|rv)VZ2fJ$z9e!Nhy$IaDG}z pd16s2LqK9?UWuNcYluRbv7V`(p@G4dqJ=UmxSEcs*;PsCF&HaZ&KH>Yoo!9{gIea;M&Bu`J#Osd>&u_nb^dJvYZCjn z-&ddg+QJ@S|E~TmL-oIS#^RsFia=9UOI#yLQW8s2t&)pUffR$0fuXUkfuXLEL5QJ| zm4T6!36N`QWnl0&CNTmskwxlmbZx=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_QS Bdv5>$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_4.png new file mode 100644 index 0000000000000000000000000000000000000000..ee8479a0213809070bb29a1dca42fbc53bce5e9d GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#UoeBivm0q3PLj8~3sV|*O$tbPfk$L90|U1Z2s2)~ zTlWVjXyfVP7{YN~_sm9K21Op{i}{>YdCJO$47|VBH!W5^I+@%00jE!E=$nF~6P{}& zrfs--K&tgW*Sp9c+V`e&>r}IMvrb8p0h*&);u=wsl30>zm0Xkxq!^4042^XS40VkR zLJWKLZB)JPgg&ebxsLQ E0CClLI{*Lx literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_5.png new file mode 100644 index 0000000000000000000000000000000000000000..6d9eaf2d44f3193b84686b26a92b3478c5b22dc4 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#w;Z?{Q{p2av^B666=m;PC858i!C8<`)MX5lF!N|bS zSl7T%*T^8m(8$Wb$jSuBHMKG@cpH-#fubQdKP5A*61Rpqj5nVEH3))iNXyJg%}dNp zwJHHJ7!2dh0+!S%0VSnClEL|DCFO}lsSE*$nRz98ey$-3WyX4@dWHrDUy2q2RWW$F L`njxgN@xNA37~xW literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_7.png new file mode 100644 index 0000000000000000000000000000000000000000..462fb1a5fb4c45a3f6821397d39ad27535deebc8 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#$@Q5sCVBi)4 zVa7{$>;3=*9XwqeLpZMMp4rIDpvdEVasJs&EN6KOgzj;&i2R`>lf&YOC7DXRdP`(kYX@0 zFf`URFw`|N2r)FWGBC0-0dh^P3=H1JBu1cU$jwj5OsmALVGiTXCqNB?ARE#$b5ipX zb5pHKfD8u1cysl|ep`T&QXt9T{Irtt#G+J&fW*wa5hJyShH1A{L`3xTQ_ NJYD@<);T3K0RX4Te^CGc literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_8.png new file mode 100644 index 0000000000000000000000000000000000000000..6c2fcadd36771a6e0feba7adc4a513875d75791c GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#YW z%y{W;-5;Q!gQtsQ2*-8ZGaGps6nUI4&Of_}6TDx7Q@?Vl9f!*&g{~{Q`Y)siU=)+`omhWyLqC0L@Y@ag8WRNi0dVN-jzTQVd20 zhQ_)EhPp-uA%;d)21ZsUK(48kfx+9D#0V4(x%nxXX_dG&%wfFw1gJp}WJ6kJPHJ9a zZmLxYkilRWZ?Rn_SQRKK1(FQTPb(=;EJ|evNX*PD(erZ+Q7ALkGu1ORF!)lm5U7g5 M)78&qol`;+0KDdWb^rhX literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_9.png new file mode 100644 index 0000000000000000000000000000000000000000..f543830420da2e9d88d9703f01ac11c219b89087 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#<1$L`h0wNvc(HQ7VvPFfuSS z)-^EHH8Kb>G_o=W^AdAY ztxA9l2E%yE1JcQxfs#@n$>997lJdl&REB`W%)AmkKi3e2GGjecJwpS7FGUN1su(<7 L{an^LB{Ts5l-_=l literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_11.png new file mode 100644 index 0000000000000000000000000000000000000000..a174d496bc14f2b2d65a0fc4f4027c0f7cbc213e GIT binary patch literal 541 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5ln4y) z32~Ja;o;+ElN9Eb66M`8A!=i9xVEzB)2B~$RK#~pOOO!e-Zm*lOjJB0x>dQ&IT;|NpyAI0^#|XH4>TcabVhe_{mW za29w(7Bet#3xP1>rMq>1fP!V7E{-7*mvbj{@--XqILk^2^@&=Ut^5D~;>_OY;-y}d zn`E{#u$*wI@OI#6c=l{{SCF>H-y3QDzT5};EM0|dY;%f6v6;eqUwRle22qbo0%T1k0gQ7S_~VrE{6o}X)o bLYc9ish**M!Iz?iKvfK$u6{1-oD!M45bDP46hOx7_4S6Fo+k-*%fF5l=v3l z6XGfBO2DVjQo{kZ-_{ zq|cJ1&m6DII3Zf0IL`9#8IMGLh9*}L7dED7b%vAE1@)MiblF*FPMoO1zz{0NlC8^F z;m#AM#SpKB#%)^Z&ozu)IKPeyVJTCqs9rh$=Ia1ruX~pH#7%xFZikxgA5E5rY9EW4tDVH#Y+- z6QctcgFP363qJ!ZGm`=nV~{jMs2oFWgkhO2Lxnv%QL?0K56;?=zJE2ncENT30*3}pm8_rrP*OWck_c% z(dp7YOpnr*@sE?M>T@YqOVK*4e%Ld7sUB&8mtyOY^=RkzLST=@=rSSE@Hb_t{U? z#V1mQ_DJpglDkob>)z4!n67O)p`o>5yL1ArMCul<+W%Ur^mA^~+kV6SXJ*+aPpXf; zC}U&2@9GYqA5}|SBT7;dOH!?pi&B9UgOP!uv95uku8~2Ap^=q=k(CLMYiea+@HQqf z0!2e^eoAIqC2kFK7;ioSY7he1kd~Q~nwOZHYE=ScFc`%f8ch;R+6R=C0?7vFrFVdQ&MBb@03ebHF8}}l literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_13.png new file mode 100644 index 0000000000000000000000000000000000000000..6c48787ece52e27b40e919f62a040b0ed9679656 GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lrRhM z32_C|^$ZM`7#RMWnMsQ9C@3fZMVOhHxw*M{czERHFVdQ&MBb@0MS5q ATL1t6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_14.png new file mode 100644 index 0000000000000000000000000000000000000000..a5d1ee0b35013961c656fc41549e362e3efb6d19 GIT binary patch literal 668 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lvoo`Hdzo13A9;SvLbva&M6|Np+e zzW>e47&I9wDk|97*)=sag@lCi^77>6<@fL3&&9>1qN1Xqp`oUxrlqANB_$;$CdSIj zs;;gsAtAxc%>4iVf7{6iVu3DWO!9VjF>~MFaS_PjEbxdd2HGVA!i<;h*8KqrF7$M9 z43W5;dj6(VlY#(i!e+l`69R7~t;pPVYu~>At4lq0XW8ZbNaSmN{3rBuZux;%RUa-W z|Jc{@>hM+x9*(LNsYhx%G$fi0W}agyH0fv1Ym(4CxjpEBs>Df^$PGeI0=~IzRGFgM zxUwZ@YhJ=;SJ|vO-5XaI{#FxNp)=!+!kcHp?hjIoxpa5Rey-VhDBErSLph~}L(K{N z^YueCLwdgde{Nsu$-B@;)6E&^Sk)5Oh?11Vl2ohYqEsNoU}RuutZQJXYh(~&Xk=wz zWMu;6npzncyp2hWK+%w!pOTqYiCe=Q#+y%o8iYVLq-Ex$<|XE)T9p793`X&WCe=m9 zyMeM&Alcyjw370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvOlhUHx3vIVCg!00?u- AKL7v# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_15.png new file mode 100644 index 0000000000000000000000000000000000000000..4722beb1a03f1713b81d629d8995370a703a6228 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lxPg_ z32~Ja;o;`y2J*zk#aUTdm6Vi(g@pwK1jNL|L_|c`*w}b@c!Y$6SXfwid3l+cndRi< zL`6lVq@?8K<+Zi7IXF0&n3(kS_4)Yt1O){-IXP8TRT&u>`T6;|xVRJ)6eJ`hWMyR) z6&0xCbaySb-B8wRq zxP?HN@zUM8KS04bo-U3d5|>l^ZwfUT@VGwQFlDX60#N~h^1uJ(O>}Ku&ON7MIr+|# zdEeFLnK+a?L^~U%^z89q)b(dj_0r-z5+ZhE&n?00FIc!sn005fyy16Se{|#Ps@o6w z)xTIMUSoWH%hR9dt;Xp{-}Fs?eD+rc94?ypXH_1b#v-4p3#Enc=N?~NJ*_DCF!#N( zBN8wD?L9coW@X)xJT0?p|DPA!u^-r7UOrv?ALvfi64!{5l*E!$tK_0oAjM#0U}&ss zV5n9nO2Eg!yLw&Pk*ARs=V?9$nLj!{^MGJwd7(8A5 KT-G@yGywoB@UbQU literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_3.png new file mode 100644 index 0000000000000000000000000000000000000000..e81cb6437562e32eef879c7f864e76d919792806 GIT binary patch literal 723 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lvo$w z6XJUM^y!l)Po6)2{=|tBr%s(Zd-m+LYu7Gbym;>1xf?fboH=vm!i5XhuV24>`SPVp zm#$p7($dnxqRYZy!N8!(z&ewaL4$$Wj+t49nPD;mqYWdIHWLFE1Jg7nMm|PHEk=e3 z3=HZF%+r|}CNVJaGcitOWENm%n8?7u$#DGm@dpncJbd`@>eZ_^Z{ECp`}W4 z(@AGkH zG;dnF-Wq%NpRYD=Z&+~C{Pz31{|X*;a4bFfFTME2J3k$ZhFyQ8Z8aA>{E+@7@4>6E z(#M8d%idgH^dKjWw@ZXc^l*qEoB8#ZJC%h_>;JJ4(fxHeXg<(yswJ)wB`Jv|saDBF zsX&Us$iUE8*T7KM$RNbf$jZRT$^^(YwK6bx845bDP46hOx7_4S6Fo+k-*%fF5l&}f# z32{Ah=1f{znyHb|l`B`u%gfbNR2Zxo_V3@{($cbF!-i?orZN0yU;vu*|G%%VFM}pS zMMcH3Wy|vN^8Ww--*D!L63`sRByV>YVV>PF(|{b#0*}aI1_o{+5N5n|x9$&6Fx}I| zF+}2W?s-nG0}4DW2Yh{cbGKaoFCYE7QFPaW7aLeu>zo)4?<`ziUaoY-uks^PN4q}5 zT3623VU4n%xl`6&v`P};&hX7!GWS>q&qs@Nj@6|*xF+2F%+u|4pWnl$uI=9!xzIn) z7)4hx89hIGNEc|OYKdz^NlIc#s#S7PDv)9@GB7mOH89jQG6*p=vNABTG68Z;tqcs_ z#w13dXvob^$xN%ntzi!1%_l$&f*>2xGILV%5_40nN`MRoqj-}&Zx)6FC8a=;!TD(= q<%vb93;~Imc_n&&t|1C##(JiDh6V;-iWUM@F?hQAxvX45bDP46hOx7_4S6Fo+k-*%fF5lyD00 z330t~YY1xu3Wj&)z#J9+}zaEba7j# zmzP&yVBqNu{+^zmr`G#jzI^%r|NocueLet9V@&dPcM*MhEak7aoN|un~%wmBl~95oyuL-U;pn96FUEDp>giUhi4ko$OU!DJC zTgDaXN%8D0vLZ)AfsRuxag8WRNi0dVN-jzTQVd20hQ_)EhPp-uA%;d)21ZsUK(48k zfx+9D#0V4(x%nxXX_dG&%wfFw1gJp}WJ6kJPHJ9aZmLxYkilRSZ+iOm#DhRdDUf7v sep*R+Vo@qXKw@TIiJqTph(ejMo~fRpfx(xeg+Nsdp00i_>zopr0IAB$vH$=8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_6.png new file mode 100644 index 0000000000000000000000000000000000000000..37a5c0ee9770e87c189c38af6e9a48e86df3cb24 GIT binary patch literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0QXv*NI(m|GJ{}z8CK$|EBJ&(^|Xkv&_+} zjAwptJyXu~T)?v9dg3ns`P!S8oO&f|vqYvV>Sk14%ez+7K*^m&Gk+z1zt%K|=W$5y z^#x7``3{%e$xdRcx^=?evV1R7Q}nNS2^My;>z#^U@A3pXUbVzEq9i4;B-JXpC>2OC7#SEE>lzs98X1Hb8d(__S(yO2 zrd9?9Z(|Z8P&DM`r(~v8;?^*S@#Yht20@SwX_+~xd5O8HRwY0NgHgO$(4zy@KuIZ( uWN?03NqJ&XDnmeGW?qS&pKFLhnX#U!o}q!km!gG0RScf4elF{r5}E*+ey>;n literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_7.png new file mode 100644 index 0000000000000000000000000000000000000000..cbbebb58d6609207f0e6698fadc31bfb9ce76651 GIT binary patch literal 643 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&A~v z32{Ah=FG{HCr_U~eg6FUbLY;TJ$v@Tg$t)nohmOc|Ns9#gEa$#Cc}Skxf3T&F#Kgm zOG~?W@#3XRm%P2beSCbbUAuPW%9YEPFJHfY{l<+OzP`ReK|!6JodE#>rKP2-SFg^? z%R6%9NM&VZO-)TfLBZa=ds|vs{QUe{TU!GI1Fv4adaU4sD$pg2N#5=*oF8v4eFNlh z7I;J!Gca%qfiUBxyLEqnf*U+t977~7`}W-SV>T3Uww)Qx)S?m{B&H#9YU}_1%_`j! zURBOWK5gXC*gCbDGv=z|vX4$}44s-wSHFI{$SF^SPwHgInF|LBlYZs@SUc@xX0`~k z;i+Sp%aj9Le@4%_?7Hyk=~fn{Q&Wx}JI`k35nWd9xA)!q+jVb6zkQGpcdNIu*)J16 zo3VZSWxbZKe;cptHiBg4&%)yKn;Q*8`3g!Qu7jXQ>{vX345bDP46hOx7_4S6Fo+k-*%fF5lyD00 z330uC{ra_Q*REW-a^%R7+qZA;-@pI#27fOvFL5z3H5C;dO-&_5#k+U!ni?5tsjJ_+ zchAMa!P>$?UsqQ_US3vO`v3p`9Lq9(15IO0@^*I-eR|{PVjzdJz$3Dlfq`2Hgc&d0 zt@{HMZ1Z$+43W6(>K`c9Y{0?2ZdzGW==R_9OBt`H*J(6P5SbxRIq&~2fxvjyi2SHY z8mX>VR~_{0HCyDT`+V*9^7~VISr?zZTW%z(9G)d`yv|H^`^s(a>SX7y zGqF|s?UO_QmvAUQh^kMk%6JHu7RPhkwJ)|k(Ggwl?jk*YGq*XHYPCwMMG|WN@iLm zZVhu7Z$1HP5CqwfmYI{9mzbMsRRUx%7{yy`je1)Hl#~KV2Ir@hlqVLYG6W=M=9TFA exrQi|8S9zq85$UTDOw0r#o+1c=d#Wzp$Pzi!?j-k literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_9.png new file mode 100644 index 0000000000000000000000000000000000000000..7fdee1088c5eb0f2689e514f7cb468d237704b8c GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0Q^~+c93R<|6-t4;b&yvfwY~r^&Cf9y5X?q1FP*++p6S1oakC`m~yNwrEYN(E93Mh1q)x(0^2Mg}245bDP46hOx7_4S6Fo+k-*%fF5l!yxO z32_C||NsBLdQ9Qjb;I)qq`y3Mcyq`6+&;-uyTyLKboui-8c zoiWMV-G%W#lkPnrhqJ&VvY3H^TL^?1FWs&C0~GZ4ba4!kxSX7DfT2f&VK>93tQH1g zV{YM14BFDx?3=j!^z!6VbobQ!VLFklSQjy0N@EnEWeZQ;`x zryu6{$;!*Xz{AC4@~Ue=B+zKp64!{5l*E!$tK_0oAjM#0U}&ssV5n9nO2Eg!yLw&PkhJyShH1A{L`3xTQ_JYD@<);T3K0RX&!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR z+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrI(WJ`hHzYWJ?qHJV8FqAfQ|XH0rThg zt7bB?EpFMTr^;|4@}KiVj_XX8+g&n5U$8c0C2f^D#9FkWl)bjHj@61keu}xGK+IMz zpjoOVt`Q|Ei6yC4$wjF^iowXh&{)^NP}j&H#L&pfz{tu3$ThVxFnAl27=fZ8H$Npa ztrE9}IgB@-05u4LY)H$@NzF^lO|>ckG8l~G4bQsRzXwW6fh2?T(@M${i&7Z^5;OBk g^!!{y6v~YCO!W*6489aC1gc{2boFyt=akR{0AU(!J^%m! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_12.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb65878252aa695ec4c46c45dd7bbdce14939f3 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_Xn BWkCP{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_13.png new file mode 100644 index 0000000000000000000000000000000000000000..83647bde1f66a4b549b076091b2cf8ec9486e5fb GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIFFM BWfTAa literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_14.png new file mode 100644 index 0000000000000000000000000000000000000000..90920c1122a90bb0c06fb0db3449c710cb9067a2 GIT binary patch literal 633 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l$amj z6XFV_B}I6+xw(N1etv!y78XuUPI-BGMn*=jD=gzuUM8TijDd3+gV20&gJld19SrPK z7=#xv@XTZon9IP>%)mEWNPC%x?lMNHWelQ=8CWMVuuZlL2deDiQCY^s#3UjjVrFJ0 zAtCYq|Np?WvP7WE7)yfuf*Bm1-ADs*lDyqrOjd4u`4`CHEbxddW?hQ; zj3YctEO-^#np|eg?A>WGGg8v<4kN?oW9(sa3)1EQouFFc8c~vxSdwa$T$Bo=7>o=I zjdcwSb&U){42`S|jI2z6TvICpgSRn>5hxmR^HVa@DsgL=!+7%vP=gT2hP2F_)V##p zRI3sogTXl7(B$yB1@C~eQXtvj{Irtt#G+J&fW*wa5hJyShH1A{L`3xTQ_ NJYD@<);T3K0RZ!>uxtPT literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_15.png new file mode 100644 index 0000000000000000000000000000000000000000..c26cd27ec70b027b581d79a9565f62104918604e GIT binary patch literal 890 zcmZ`%ZA?>F7=CWsd;868Z$GtIpst7m%DpYc*es?Pno_+qfc(&8aa1ghAfTm)ZV{28 zf}cbsYD9+vPl8j!lzl`^W{iotIgJqGG%+#8L}%EKZEPlsOLzLyAO3jHbDrnC&->;* z=M2`yqek6)9ROpjx~iU{DH|FkU5iTjRTNYkDr+i%Zw~3-CRoau&id$bT)db28zuQo z)%7*NXN5p-KkzS=dS3xuBJjEq2ptC;n?|nGeMEgLYUPH=JgY&k*V8nI!@;tw$K$bB zEGCo5Zns;lR^SWO0+O?cKsmH1Ou!xn`g98kbjO?$LC#5)N(Jl!KVm5%3Kz*KB$@&O z!wFbMVIR|a2yA0YrP95GKr?JK8r^QU&1M6(tMkaP-M*cgIc{sVjp`uJ8w&}{r;Ce= z)%j!xFvBpva@`(y%F2LN)=kW2v%yP%yX!cFCse?iY{73ug_mfU^>NdoFEA70$OFR79XY3g=m6E>S2HPNy@I$qaS0X5Wojw=!DQ zc9p{gO0=7**K`7UAsfu})1J3fd=jgwY;evrHD1SlS-vaFCFf;%fw~j~|`dU-IL~wLVXEIJRb2tZsO)=0NP!G3^JV1vkbg&R!V%`qp>{ z1o1^s2v$hJ!1t3=m%d{rCcnMhEpASywruX|R8KU{ndavH{O6Cq|JoopR3{4-yG)K@``w@M%fa( zKQM4PzU21Z=l7o7;k2TZ4D1ZYp+8bYUNQ-Fp6A)(OK<3u-gIPjdVM0D3^k>a6yO)7 zK&dE|`o#vx9}@kca!P|CQT+Ym#OikpZ5``dnzy~*Fv2{3K@CE-Lvzc6xY|A)KYk@7#dj_7+IMBxu#YI25(~$BTzKt=BH$) zRpQn#hw!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#<|Ns9#D(XLwev*~c1LQL%dAqwX{%6v?2jp-TctjR6FmMZjFyp1Wb$@_@ww^AI zAsp9}6BrmTUbrA2V94sxVw*VO|Nr-#&2Ro!J1i3MI8o2O@la#Zr>}($i}vvO=rFGO zZO^*SoFzwyA#u0#rN(n94}k`$mbgZgq$HN4S|t~y0x1R~14Cn714CUSgAhX_D+41d z6Cl^r%D~`lOkxCzhTQy=%(P0}8s;$Gd;-)U2(lq9Gbc4KF*nt!1jt}8jyG2JiaQLH xlmbZx=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`ESdI10c literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_4.png new file mode 100644 index 0000000000000000000000000000000000000000..1b38b2768eb1f107459adc7ec1f014a5c9978297 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lrRhM z32_C||Ns9lFE2MY|Ifg1C@n3mv$HcGAfU9gboJ`hd3kw9jvOf{DA>DqZ%a#ypPyfA zYimtSO&;Iwqd=XEN#5=*jQ^Q*?*TcS1s;*b3=G^tAk28_ZrvZCV6dl)V~E7%(mqe2 z1_KV3%UO4>|E~{I*yz$b_w*9URU8kQKlFt3siXv$f7>)c#qFe%@;X7&?)FK#IZ0 zz|dINz);u7AjHtf%D~9V1jseDGB9`>lNf=bAvZrIGp!Q0hB=Hkp8z!of^103%t_5l z%uTf_0Wuhj<4yMJolXEsN`WMU^V3So6N^$A0unRxO7#3(Llnx4^-T2)4Gg{%Ed;7! N@O1TaS?83{1OP~Kn5_T+ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_5.png new file mode 100644 index 0000000000000000000000000000000000000000..0b061d1fd65ae5f7fcf9b02bd56e2583245335cd GIT binary patch literal 683 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l-L#E z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QOS!Q+RgW@caSkA1_^=UpM;l)ZyGd z$+P<;K0mR4ci-~K75(QojDNj${qe&2=PTD6CzKyv(s^;y|X;&-6k%(fVk4P=v1ejS0bBMe+x`|&ATJjcfN7=p4Pko`OlN|ri#5iP+MnlDdy`- zo?VFt4|ealr%}Lv^2>*on-cRyv%Yzq{&srSvq|~4o`2r`OMK!zuF$g7hde-cs+PD$ zl%yn45bDP46hOx7_4S6Fo+k-*%fF5l&A>s z32_C|SB}V^+b{L#vhMZcN|z7IeRyE~^_kJ+{4cNcPK9hvzqp@1E0qa6!BDdU`(4ZpI{UcNdA-nXPg_4rhT!WHAE+ zw-5+3UbEak7aXGjDrBIUrPm5*CA_v!OlRF*k@Bg>$$h7`*V9Vs(eJMtF z6@CaOipVeUTxIm);}r3L&{xJ=cE#|15zD$%apz<^Gk=oi&E{D%o-&yzY|C}jYN&r$ zreWPUDRt3ThU5CC(ifPlZrLgM{bH<~GjH?eZ%$S9`yQp=jE-kK{*e2^bKdDaK$obN zxJHzuB$lLFB^RXvDF!10Lt|Y7LtP_-5JMv?10yRFAlKB&z~F66Vg!nY-29Zxv`X9> z<}luT0@NS~vLP)qCp9lIH`S^H$Y3yzHw#u+FVdQ&MBb@04JH45bDP46hOx7_4S6Fo+k-*%fF5lvott z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEn;p%YVLf`TzgFx%qzvhC`no+x>Xy za(16YT3XtZEBdE*i+y|U^zf3-mnZg@kH}v-B>Vcd+4~39_s?rRyKea6rpc9~3eRsC zKfP*je!tY|J>s36odE#>rKP2-SFg^?%R6%9$n_J-_b+I_x@}reP_TFJ-j_L z*4CPunlDcs?w-?pal`n*1?|YLtNB1zGA4PuyKu{2KXL%b;VkfoEM{Qf76M_$OLy!3 z00sL!T^vIsF6Z`l@-;c|xU7EhC@4@{ZiU9Z2etqIuiqK$qjE8Glkx9MCb}2pLs!M| z#+lbK=XoEp-*Dy*&sLEwYrOj$xNeC}+%GHZnD%ypUPne+fFV~`XI_cMzNSe^4RQ4b zSN1--C}HQhjIn0gIq_XTj10F#%EWzN2sX=ciS_=ZHPtxx8Qf&)4c-(vx;@ zb^duXI~C|O)e_f;l9a@fRIB8oR3OD*WMF8lYhb8rWDsI#WMyDvWdh`yS{WF;jY*6^ z(U6;;l9^VCTf-d2n@@lm1VJ{WW#**jCFZ7Dl>iwG#_{GV>a%VEC8a=;!TD(=<%vb9 m3;~Imc_n&&t|1C##(JiDh6V;-iWUM@F?hQAxvX45bDP46hOx7_4S6Fo+k-*%fF5l$aCX z6XFV_&CUOp_6f!n@$L~5n;O+sPkVd&bNeKJzI6HY z*!Jr)$5*#aA6?dce%_4OU|&rj^XJaxEx zPV>bL;|CYC|NsA=!u!hu=sw0IZ+91C^Q$#+Kn`btM`SSr1Gf+eGhVt|_XjB0=;`7Z zB5}F5_c&iufQU<_$jcxWX%4So&29hxTfDR3n6V*Ita#GoXqH65whkd_C#SF*Zcmw9 zoi6iod|H$;qo%1PwRqvn%?X=6**m_T95H$ATO;>bb7q__PeKj>dIHFf7cwm|0$Kf%$05Hn=O2|fsRovag8WRNi0dVN-jzT zQVd20hQ_)EhPp-uA%;d)21ZsUK(48kfx+9D#0V4(x%nxXX_dG&%wfFw1gJp}WJ6kJ zPHJ9aZmLxYkilRaZ?R=YyEjl$3M3hvpH@mdKI;Vst07FjgL;wH) literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_10.png new file mode 100644 index 0000000000000000000000000000000000000000..f7ba365f20700cbb0a8fe314f54606afa5be11fe GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ976Mf!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`ZE BWy$~m literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_14.png new file mode 100644 index 0000000000000000000000000000000000000000..c1753b1eb1b99afc7aebe448277a8d5c39706a6e GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_Ui BWj+7^ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_9.png new file mode 100644 index 0000000000000000000000000000000000000000..1f15302b299f641bf7b823f92476aa022faccdf7 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM@oty!5+IMWz$3Dlfq`2Hgc&d0t@{HMRPuCj4B@z*oY25% z$;`&eC(y*;W>A!oRFIMA@gQMB0~a%c;cKSlX%XCCfT~qXTq8SYz1(FQTPb(=;EJ|evNX*PD(erZ+Q7ALkGu1ORF!)lm5U7g5 M)78&qol`;+00c;6O#lD@ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_1.png new file mode 100644 index 0000000000000000000000000000000000000000..a3abf5ae0f1cd18302bad5bc918d3ff60e0afa26 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8Kqrns~Z6hHzX@PB_5) z<9~g^5B{W@20@2CT!)eq9z-z&v!{MI{Po~Teg&392G6=3mVe|6A~+d*zVPkVvAnec zs9&|jHKHUXu_VKYk@7#dj_7+IMBxu#YI25(~$BTzKt=BH$) zRpQn#hwFkYsRvT1k0gQ7S_~VrE{6 fo}X)oLYc9ish**M!Iz?iKvfK$u6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrW_r3fhHzY$J!8ms z*nr15&}*@nx0JDo=IjdcwSb&U){42`S|jI2z6TvICpgSRn>5hxmR z^HVa@DsgL=!+7%vP=gT2hP2F_)V##pRI3sogTXZ3(BR<-Yi*#c6i7BWKdq!Zu_%=x kATcwqM9KLZB)JPgg&ebxsLQ06r9lY5)KL literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_11.png new file mode 100644 index 0000000000000000000000000000000000000000..e15be7618382b5369cfeca147d69fcc1bee83921 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8Kqrrg^$JhHzXLJ)IjMPxxv5qqKn8*ARs=V?9$nLj!{^MGJwd7(8A5T-G@yGywq3p@qBv literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_12.png new file mode 100644 index 0000000000000000000000000000000000000000..bb9c6801f8704d36828e8bf09429cf8d6750f39a GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8Kqr7JIrlhHzXLJ)_8X z*g(ML;>SfNj@(?Sw@22v9<=baxOG*UEd5La2RC2NL>+N;h znS$?r*we6l>Dzl*Xs6W#<|`%wg4-AM7)E;k&rG9$N!{ z?_YKLq4Hz)KcA#qT&5mm23oIL;u=wsl30>zm0Xkxq!^4042^XS40VkRLJW-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCICWzls*6e literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_13.png new file mode 100644 index 0000000000000000000000000000000000000000..2cdf33f158befc43d70a6cc32777d332ac41f486 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrmU+53hHzZxJ*_Qt zRDp-}0=HK1VRuF2z?tiW0%p$2V=O!29BOyRkX_t&o=?lguaZuJQ_gl5Ha`u2tKPP2 zN!6RCU03h!;W#Vb^Xy^7-eqd+LQ`y#Pw>P%ahfp2`)R2{>34>f_1wGt`?I_ZC1XOS z-9D#v!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrmU+53hHzZxJ*Lgq z;vm3sAt{9YuzT;EEvw#W?hX{?375Dd*YB!0eYu>QwdTx)`FD0_x2@IEQ`;hU<$UW7 z8?QT}9}VpH@MPxii!_)ZJ^hKaeTM3VO1ZT~N1p7w*75qR*mkvqswcYg`z|l46l|M$ z);{aS)hV^x?QbsBcpN6{4DzdLiEBhjN@7W>RdP`(kYX@0Ff`URFw`|N2r)FWGBC0- z0dh^P3=H1JBu1cU$jwj5OsmALVGiTXCqNBCARE#$b5ipXb5pHKfD8uHctewCOaB`I yWu-u}!TD(=<%vb93;~Imc_n&&t|1C##(JiDh6V;-iWUM@F?hQAxvX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR z+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrmU+53hHzZxJ*FtsYQV#KAYkf2k$|al zSD4Q+a@>2cp!Lzek5(&A-4E4Xy-y)@Y3z>Kg~GNodN>|_Y`Cj&@9gAy*BS-ClBpMF z#;Zg&a91ZBlglW|te79Q!E2jESM~gzf0D&cHisoA^jUA8yD4Wy*(NXTQyJU;G2S%N zc;u7S+z)htYKdz^NlIc#s#S7PDv)9@GB7mOH89jQG6*p=vNABTG68Z;tqcs_#w13d zXvob^$xN%ntzi!1%_l$&LLeK`GILV%5_40nN`MRo(|AMEiHpuJ0m@2&WP|h5O3D+9 nQW*jgGxJLH{9Hp6%8d0)^$ZORz7#D4s$%eT^>bP0l+XkKq7;vN literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_2.png new file mode 100644 index 0000000000000000000000000000000000000000..22db373ee218b1cd967ae6b90ecf3adb403f05b3 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrI(WJ`hHzXD?KR|M zP~c#;-u&Tz@678TnOV8rtWDgD7$y`NB>h;Vy@4x9%gb(Z&)m~2m*a|?F7>zN>@D|r zZ2#VT@=f8yqYMqqK(ka!Tq8FVdQ&MBb@0Mk!%fB*mh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_3.png new file mode 100644 index 0000000000000000000000000000000000000000..750b51934662259c760a63acc064bc708d1ffe03 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrdV0DzhHzXr?cFHI zpuoYre_7)HbF*IFa1ai3`dFYMFhyj8lha?X3A=B$eOvU{>8!~AE$>$H{;ZkmcQ|=- z)q&Go6f!6*k$zvb-Y6VssA`F8L`h0wNvc(HQ7VvPFfuSS)-^EHH8Kb> zG_o=W^AdAYtxA9l2Ge+B z_2Wu~KuIZ(WN?03NqJ&XDnmeGW?qS&pKFLhnX#U!o}q!km!gG0RScf4elF{r5}E+n C$$NMJ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_4.png new file mode 100644 index 0000000000000000000000000000000000000000..56beb2d6ae9f48a090a9ba61f4aa00253c1a4383 GIT binary patch literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrhIqO-hHzZh?KKoT zV8G#Y^3UO_QmvAUQh^kM zk%6JHu7RPhkwJ)|k(Ggwl?jk*YGq*XHYPCwMMG|WN@iLmZVhu7Z$1HP5CqwfmYI{9 zmzbMsRRUx%n8uszT)h1fP*Msc8JwS1Ql40p$`Fv4nOCCc=Nh6=W~^tbXJ}yXrD!2g O6@#a%pUXO@geCw}W`NlM literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_5_5.png new file mode 100644 index 0000000000000000000000000000000000000000..5079c4239816024fd6055a72ef22ca5703f54d88 GIT binary patch literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx+BpCi@`0fExEa{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrMtZt9hHzY0?cFJQ zz<}eZoi6W=vtO2cEvaa7QE^y!T=B`RCEib$tl*4hdXzc0G49K(rIX86rXN0gnr++5 z_OAC^O5Brz6Bwfo?l8anLdKtu(L;A)UY^$Ty{}pCu}Oo=IjdcwSb&U){42`S|jI2z6TvICpgSRn>5hxmR^HVa@DsgL=!+7%vP=g@I zhP2F_)V##pRI3sogTXZ3^xTqm7oemRNHRD-t)x7$D3u`~F*C13&(AePq0Cs%RL{`B T;7id$pehDWS3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8Kqr#(KIqhHzY0?KKo) z4P;@7)^hwcdG9XY`!C;ce(R5#^2&&Ljx|5u+o!!;iD_bi`NJ9OP{{qvNyt-APf?Gyej0@7@k!VawfTBKUy8c~vx zSdwa$T$Bo=7>o=IjdcwSb&U){42`S|jI2z6TvICpgSRn>5hxmR^HVa@DsgL=!+7%v zP=g@IhP2F_)V##pRI3sogTXZ3EPU;?e?UnokYsRvT1k0gQ7S_~VrE{6o}X)oLYc9i Xsh**M!Iz?iKvfK$u6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8Kqr#(BCphHzY$?KR|M zcI04gpT>4MZu0ugZ};_8J2GiX^rqZ=AR}uzW%+cU2?;y@)XXkl`uqiZ+)ZcyzS+~) z#wh;}GMphhH(;9ZG|kX{pPy_l=XdEYQon6qRCsZV&Gs+M7da#teZ-!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrrhB?LhHzY0?KR{( zY{0|pFS)hj)eKd)!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=cu> z$S;_Ip=|P53lJ~K+uenM-^$2tF_6bu;1OBOz`!j8!i<;h*8KqrW_r3fhHzY$?KKo@ zFyL@zR_1>2LTUZt<$2-$;nj@2dX@htPB>6cptHiBg4&%)yKn;Q*8`3g!Qu7jXQ>{vX3!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#<*E2Bu|Np;oWx+8Zhp{BcFPOpM*^M+1C&}C0g(;1@CIzItz$3Dlfq`2Hgc&d0 zt@{HM)bVt24B@z*oWKi&35f{;2??bEEE}a7bkyB;NX%(n(kJLD%kI--YGT5`Amze7 zA)fh_Jy4%&iEBhjN@7W>RdP`(kYX@0Ff`URFw`|N2r)FWGBC0-0dh^P3=H1JBu1cU z$jwj5OsmALVGiTXCqNB?ARE#$b5ipXb5pHKfD8t+c!ND1XD0zAr9hIw`DrEPiAAXl l0g0J;C3=3YAqr*2dZv1Y1_ob>76Mf!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#<*E2Bu|Np;oWx+8Zhp{BcFPOpM*^M+1C&}C0g(;1@CIzItz$3Dlfq`2Hgc&d0 zt@{HM)bMn14B@z*oWKi&35f{;2??bEEE}a7bkyB;NX%(n(kJLD%f88qK_Z-OsixPT z1fU+(64!{5l*E!$tK_0oAjM#0U}&ssV5n9 znO2Eg!yLw&Pk76Mf=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15{dyn zA+G=b|F;kH`N_cWiGkrM1H*p?hFc5_+Zh;cGcasnVE6*m@{0W(P%&eYx4R2N2dk_H zki%Kv5n0T@z%2yAjF;}#{Q(Lpd%8G=a9mGLP~bH%GT?BCIJGWd;RY@ZRdP`(kYX@0Ff`URFw`|N2r)FWGBC0-0dh^P z3=H1JBu1cU$jwj5OsmALVGiTXCqNBCARE#$b5ipXb5pHKfD8t+cteBFwNs7)Wu-u} u!TD(=<%vb93;~Imc_n&&t|1C##(JiDh6V;-iWUM@F?hQAxvX45bDP46hOx7_4S6Fo+k-*%fF5l*kG2 z32_C|k|I3Z+}uD0KR-VU3kxSFr@Xv8BO@a#D=QZl7aJQJ4-b!mf`Xu+ps1**goK2w ztgNDvL>4nJa0`JjcMdUMNDYaVnmVP*?U%n7yTGgo8g-4X z3=<}#S+?#Fo)WP4X#J~aET*|yl0G-Twz41mZr@#iZ0-=5g`PV1{nmr(b` z?Xv9R_AEl%M6LD!ZB#9BjVMV;EJ?LWE=mPb3`Pcq#<~WEx<&>ehDKHfMph<3uBnxQ z!P}U`2ow#u`6-!cmAEy`VZ8YSs6hy1Lt17|YF=V)s#OV)!C)3|XxLJ<1Qf$kAlcyj sw370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvOlhUHx3vIVCg!0IvU(zW@LL literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_12.png new file mode 100644 index 0000000000000000000000000000000000000000..843cef29dcc55dfa4266d4492adb1186a7a18bbf GIT binary patch literal 713 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lsFvV z6XGfv9a;+@CXSBv9Pf4^71k>Gt0@z ziHeF!Nl8r=6RTxlXk}xoU|?uwVd>-N*VfkN;NW0lVyb6gxXj3SgN^MJ1H&Z-h9U+A zeSLjCK0ZM~K~7FiRaMnCcJ{v}Cg1h+uCubXu(I;=^Vcyj+~VN)@8Iy?%2BR0px_2i7sn8Z%c=c0g_;sL++L^5S~^uX>So^R zw>S6g`yYLDeXQtVo&q*Ig{i+bo1{3LZpxb=oG@v5!psI;y#}SW5TOg2nhQP!N!~qp zZec_0!l>1|8W^Ak3efQzopr0RHUNrT_o{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_13.png new file mode 100644 index 0000000000000000000000000000000000000000..6a412f8e86a1b68ac6b088e5fbf746a79802d1f3 GIT binary patch literal 424 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+A80VJ;8bUIvD}Yz*6&|NsC0L0$X}P>``C$S;_|;n|He5GTpo-G%i>{>$S)4rhT! zWHAE+w-5+3UbEal|aozRoMcxAn94r@Jvx&wsm^JKb*zn&^Yu1;2dissb z4sKntQg(id)PKml@t83&6_16NMh~s5DzZ)DzD!EHMM2>>4(1bRqbBFVdQ&MBb@05edBx&QzG literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_15.png new file mode 100644 index 0000000000000000000000000000000000000000..49fdb49a1a940a14e5a29ea3f0191d75cc23549a GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#nC}Q!>*kach{vc=HKRgAmAuw9K5;yu{p8s}dlC!7Sd;v{^jC3n(iE vk`2yJD=AMbN@WO0%*-p%^K%VRC^ObG)iX3O_)@eGsEWbU)z4*}Q$iB}O9^$% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_2.png new file mode 100644 index 0000000000000000000000000000000000000000..6cf5925aba7a818a320fcb644f68386870b365f0 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&U#<*E2Bu|Np;oWx+8Zhp{BcFPOpM*^M+1C&}C0g(;1@CIzItz$3Dlfq`2Hgc&d0 zt@{HMl=5_O4B@z*oY260?ZO2HHZe9f#!DO<%q$ofa#u4QPcPi}4X8@B#5JNMC9x#c zD!C{XNHG{07#iyu80s1sgcurG85mia0J)}C1_p0q5+hJFIjMPxxv5qqKn845bDP46hOx7_4S6Fo+k-*%fF5lxPg_ z32{Ah=FF-Ufzzkz^mU6bobNDYl3HK4#Htkmi{?AboTfKfyvEDB63B5A^|Nrmq5bf>|>Fbu7JV9kbpK4E+Tu+yDe~rfW)6=Eh-XhV~EYR0u+SV-9+`#MQ<#l?4KTE?08K7erlf2zsgn4$yOapQ_ z3p^r=85p>QK$!8;-MT+O!75J|#}J9jbI*E;IT(nz1lDpWy4>$JyZN6=Jqe4opRr5-|Xa2P_XD(Brutw;TUIPkBT9y$L2i=YffwyS+M5S zvfSCbv>12QNi5Hl`Sot^!_S-6oj$Wae&5^U8}qq16qkx<#jHJamw!&M2G@?lI{R-x zSE!b_MwFx^mZVxG7o`Fz1|tJQV_gG7T_b}KLnA8#BP$ai*VM|u;B8D|1d4{-{FKbJ zO57UeFy4Fu)F245AuTf}H7_wY)v5%@U@(g}R&AW40hE*iNe1Vqm6RtIr7{F0X6BXX f`MHKDlo{)p>KPgsd?{K8RK?)w>gTe~DWM4fK?cf; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c56e943b5acf39f949f75b692be02604713939e2 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+Bf6obmDTIlaN(%gd{&p5g!h|H~dMHU`QvCV9KNu>Qz@c^t^$EbxddW?y3xhDC#C!r3?@e#y^3=e9OIrF zmvF85Fwd2(*JN8>`z&ytXrS4_s>ia~Sad;nFVdQ&MBb@0PRbRoB#j- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_5.png new file mode 100644 index 0000000000000000000000000000000000000000..495426b65e504881330f9f053ae97cb7f2788603 GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z32{Ah=1f{znyHb|l`B`u%gfbNR2Zxo_V3@{($cbF!-i?orZN0yU;vu*|G%%VFM}pS zMMcH3Wy|vN^8Ww--*D!L63`sRByV>YVV>PF(|{b#0*}aI1_o{+5N5n|x9$&6Fx}I| zF+}2W?s-nG0}4DW2Yh{cbGKaoFCYE7QFPaW7aLeu>zo)4?<`ziUaoY-uks^PN4q}5 zT3623VU4n%xl`6&v`P};&hX7!GWS>q&qs@Nj@6|*xF+2F%+u|4pWnl$uI=9!xzIn) z7)4hx89hIGNEc|OYKdz^NlIc#s#S7PDv)9@GB7mOH89jQG6*p=vNABTG68Z;tqcs_ z#w13dXvob^$xN%ntzi!1%_l$&f*>2xGILV%5_40nN`MRovv|`pk1S<@l2Rba;QX|b q^2DN4hJeJ(yb?V>*ARs=V?9$nLj!{^MGJwd7(8A5T-G@yGywqq=A!=q literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_6.png new file mode 100644 index 0000000000000000000000000000000000000000..da048389710af932933a3da82e25134ec8d13cc3 GIT binary patch literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lxPg_ z32_C|X=!Oda@KT)j5LO2iy3@<7;>{2%1asM&tWJjVrZyixO;=4x{@I)gJIJ;hS+F^ z!hD97Muy1~7;38-D#{pIn;7bA8DgRsD$5yivKZ#fWZ1QhAu58QyMv*_oE; zy;>wStALT=!a|nrb&uBM1I<@0ag8WRNi0dVN-jzTQVd20hQ_)EhPp-uA%;d)21ZsU zK(48kfx+9D#0V4(x%nxXX_dG&%wfFw1gJp}WJ6kJPHJ9aZmLxYkilRUZx;GGV>wV# w3M3hvpH@mdKI;Vst07=-aD*ylh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_7.png new file mode 100644 index 0000000000000000000000000000000000000000..4d671e50cb4c6e677d10e6ac4fdef1c5f5577d24 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}o& z32_C|_JKYU3=Ccj3}!$D3=Ek-?F z{{R2~(cn=ZP%~qax4Vl_^`0Ccn}M^yBeIx*fm;ZK886+f`vVlz@^o=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+A8$KG5eU1H&fQK$!8;-MT+OL1j-D#}JO|$q5R)21W)P4iTr;1uWdarJ-D+HAPUS zb=`~%28Qz{Ods0&rtJbMS1oakC`m~yNwrEYN(E93Mh1q)x(0^2Mg}20w&DcE%ZP*Msc u8JwS1Ql40p$`Fv4nOCCc=Nh6=W~^tbXJ}yXrD!2g6@#a%pUXO@geCw#sByah literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_9.png new file mode 100644 index 0000000000000000000000000000000000000000..13d1b3e6bebc32fc7f36dee3b6e3aedbf45c89fb GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lrRhM z332`Z|G#~pj|2mQ7f=AGfPoYh7ML)4 zz>zbDx)!zc&TSTUZRnoeF7DdUAMYTrf8iBY2EQJLxsrR9PXp>wEpd$~Nl7e8wMs5Z z1yT$~28PDE28Oyu1|fz*ARs=V?9$nLj!{^ SMGJwd7(8A5T-G@yGywp~x^Mje literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_0.png new file mode 100644 index 0000000000000000000000000000000000000000..70564fb2c0a46a8464d576737f7676fb8c623b8c GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#<_h-r~nX>->|35JIcP)_5SQ6wH%;50sMjD8d!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#->|KEA@J7plBu_VYZn8D%MjWiG^$=lt9S&+vEWHo1jM`SSr1Gf+e zGhVt|_XjAb@9E+g!f`!0;lzcMganTVErJSp8UhAuPF;vOdSS|en@0{jIBnC}Q!>*kach{vc=HKRgCNL;w9K5;yu{p8s}dlC!93pZl<#z7prjN? uGB`i2q&%@Gl_4N8Gp|I?&oxA$%vjG<&(Of&OVL80Dh5wiKbLh*2~7Z;{dUIy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_10.png new file mode 100644 index 0000000000000000000000000000000000000000..801a332be4c3480d7b2ab39fa2297a2d00f79d85 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#m!*m}+9X;^iz=;OG2Gs*z8(y$7?3>Lk z>Fur03)G=n;u=wsl30>zm0Xkxq!^4042^XS40VkRLJW!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#~dWhiZvyL`h0wNvc(HQ7VvPFfuSS)-^EHH8Kb>G_o=W^AdAYtxA9l2J?7BLz`oV&498}Alcyjw370~qEv=} k#LT=BJwMkFg)(D3Q$0figD*u3fvOlhUHx3vIVCg!005!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#YW z%y{W;-5;Q!vZsq<2*>s0go1>W1P5iOU}a}XiLkXyMZy+_oD*1FIG4pS9 znO2Eg!yLw&PkHGA4R!Dh4m1}p9D?CujbE39q^ zJX6mW7NT%OA^x1`iB~6AD`l)Z{p$JC31<|J9eQ$PRr#vJJ)TWd9RuBZ4>rZloojmc zO+)7@wbe1sWm?VCx=MJpo7Zlcv_el?zqo>>c}v4O`_*eUHn!#ItX@8$(at$ySquN_ zscU(*FBVgyZC%0E0rc#5JNM zC9x#cD!C{XNHG{07#iyu80s1sgcurG85mia0J)}C1_p0q5+hJFh ZJyShH1A{L`3xTQ_JYD@<);T3K0RT8h(45bDP46hOx7_4S6Fo+k-*%fF5)W;X# z6XFU~@bjh1x95&euIPVx>hS)))%yq5uWp-OIwX7lg7)b>;%E0s{CMf|?7HFe>qd_+ z>s>#g{N;)L!%I5%&uhKCYjJMB)S0~!ch6~DJ|h3=vF(Qk*3WMkzqn!i=(6sEi#lJQ zIsSU>di}W4j~C9LpV)tTY2=C{wNzq@aFZlC0--C|F! z8eBds_xiTki<>4F56N6QEO+~~+5@07c8lFPt8w9gG|;s`$J{)n3bY+)8qihWo;v{z z0on`H0(2G79H3)>CZE|Oe&vWf&}%?XJ-uoGH2LZ=g)2uDfYt%s33MdTBA|`u4@d(Y zd49jtjT6fM|Nq~;$96Z+4y%$NKTuGU38t=pVFuL7nB?v55;<$r7YQJTv%n*=n1O*? z2!t6g-L3lr6g=$d;us=vS=EnK=&%7#vHRU?hR(-t7&f=d8eje&zsch4Tz@O=NjwMS zHc4hOD7^T>cI-li(D53^wC+-;MJcnnZnPsd2M@c)Qj1QbG+y30LqJUe@ zY5jTm28GYb8Zw(O3@?Ks;j$ZtNC5wV~Wh_5A^V8G~ zL38g`u-?0Rd~#I$`@ifz<*%RAnN+g!s`Rb3_tVz6zRgW{;pfU!bARmqcCL%~61k24 z+B47COZ;P0njpQ4@BXPRK<}uQxJHzuB$lLFB^RXvDF!10Lt|Y7LtP_-5JMv?10yRF zAlKB&z~F66Vg!nY-29Zxv`X9><}luT0@NS`vLP)qCp9lIH`S^H$Y3y!H#G5CW4;q8 xD+Q7b&QB{TPb^Ah2uRG#E79|F4N)jF)-%;JG%)y5v=FF@!PC{xWt~$(69C_uVi*7b literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_15.png new file mode 100644 index 0000000000000000000000000000000000000000..22eaf31ea43bd7334bb13d373e703adcceadef0e GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;164C)a zA+A9B%wCBH7j>RqHTd$>;mH;K+o#no9FYG1|3428!(pH_M@f)hFpvg=?azZ20vU`+ z-tI0OZTF^D0Xdun9+AZi4BSE>%y{W;-5;Q!yr+v}2*>s01O--(LlRyFZH7G$ow_U+ z8n{XI1oACq^tixySN!5+d!SO)64!{5l*E!$tK_0oAjM#0U}&ssV5n9nO2Eg!yLw&PktJ(E| xvQi+~;QX|b^2DN4hJeJ(yb?V>*ARs=V?9$nLj!{^MIbLTc)I$ztaD0e0syA>cNqWx literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a1391f6a66c06e4693368f3924806c6f2ceba964 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#<`}p`MnX>->|Nn`w*Fhkku_VYZn8D%MjWiG^$=lt9S&+vEWHo1jM`SSr1Gf+e zGhVt|_XjAb@9E+g!f`!0;lzcMganTVErJSp8UhAuPF;vOdSS|en@0{jIBnC}Q!>*kach{vc=HKRgCNL;w9K5;yu{p8s}dlC!93n5*yUI!P*Msc u8JwS1Ql40p$`Fv4nOCCc=Nh6=W~^tbXJ}yXrD!2g6@#a%pUXO@geCwQ%Xc~e literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_3.png new file mode 100644 index 0000000000000000000000000000000000000000..5f1bc4a7345d9bdbebce8f20c29cd33f9670a687 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#YW z%y{W;-5;Q!zNd?02*>s0gcBE15)wQfvG_o=W^AdAYtxA9l2J?7h73XjAKuIZ( uWN?03NqJ&XDnmeGW?qS&pKFLhnX#U!o}q!km!gG0RScf4elF{r5}E*XEO-h4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_4.png new file mode 100644 index 0000000000000000000000000000000000000000..ad776e992491b5dae1ef82cb06fc0f15d0a79702 GIT binary patch literal 413 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#YW z%y{W;-5;Q!zNd?02*>s0gcBE15)wQfvG_o=W^AdAYtxA9l2J?8+vkJjlKuIZ( uWN?03NqJ&XDnmeGW?qS&pKFLhnX#U!o}q!km!gG0RScf4elF{r5}E)Cm3OHC literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_6.png new file mode 100644 index 0000000000000000000000000000000000000000..83557735dcdb9952f93b6365208286150d9fe4c2 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#<_h-ufXJGjM|Np{E#vVXEV@Z%-FoVOh8)+a;lDE4HvmlQT$ZF04kH}&M25un` zX1sK_?hjB<&C|s(gyVX0g2#iD1P5iOU}a~?Fx>}HM-MzWaH7GlLG^&wh8L_1`(|@X zdVA~h0(GdCxJHzuB$lLFB^RXvDF!10Lt|Y7LtP_-5JMv?10yRFAlKB&z~F66Vg!nY z-29Zxv`X9><}luT0@NS~vLP)qCp9lIH`S^H$Y3y!Hw)2ZngEoP0!aqvrFVdQ&MBb@0IzRvEC2ui literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_7.png new file mode 100644 index 0000000000000000000000000000000000000000..4674a6918e410192f5a8707388986713813a41f7 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#GPB!lzQO3D+9QW*jg jGxJLH{9Hp6%8d0)^$ZORz7#D4s$%eT^>bP0l+XkK*M)5n literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_8.png new file mode 100644 index 0000000000000000000000000000000000000000..8d40f447af931a14661033cff6a85aa688d12e8d GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&U#<`}p|$XJGjM|G&tZrY}G~V@Z%-FoVOh8)+a;lDE4HvmlQT$ZF04kH}&M25un` zX1sK_?hjB<&C|s(gyVX0g2#iD1P5iOU}a~?Fx>}HM-MzWaH7GlLG^&wh8L_1`(|@X zdVA~h0(GdCxJHzuB$lLFB^RXvDF!10Lt|Y7LtP_-5JMv?10yRFAlKB&z~F66Vg!nY z-29Zxv`X9><}luT0@NS~vLP)qCp9lIH`S^H$Y3y!x7a*Ue>zZ73M3hvpH@mdKI;Vst0Qh`xKmY&$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_9.png new file mode 100644 index 0000000000000000000000000000000000000000..20f4ce68cb1049bea7b10662ba012223ec2a770d GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+A9B>C>nGf#w}Q{{R1fgUFx=pb%q8kY6x^!?PP{AWo9Ey9-Ny#?3$=hqJ&VvY3H^ zTL^?1FWs&C0~9p#ba4#fxSpJlAdr+0mcqcO$j0`D$I(&I(b3h>kxf-qm5t+|!hr(^ zIKrAIGluhA?>o*V!ORel$+F7+$EPPi6I4rFBT7;dOH!?pi&B9UgOP!uv95uku8~2A zp^=q=k(CLMYiea+@HQq9<}ls_*&qnAAuTf}H7_wY)v5%@U@(uj zJTgt55hy7Ik_^sID=AMbN@WO0%*-p%^K%VRC^ObG)iX3O_)@eGsEWbU)z4*}Q$iB} Dm+5v> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_0.png new file mode 100644 index 0000000000000000000000000000000000000000..a811102f4ff56283caf6ef3edd800d35021dee1a GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z330u0<;tyFx4Ie|Z{NOs?b@}64<9~w@ZjpztB)Q%S}=3wrAwExGBU1TzkcV=of|i9 z+`M`7;>C-XFJFE;SMLA+|3!O`8w1T@O!9Vj5$4$)GY!b$EbxddW?CvRqBb;l!f#&Tn#;Fch}g)r1s0 z3o#Gg(!8fj_U@gN?-`_CPVkOd&!B!v*6{hcp ztHiBg4&%)yKn;Q*8`3g!Qu7jXQ>{vX3y#N3J literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d529437653ad9f43264f81e31e8b6a6ac8f8c2a GIT binary patch literal 538 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z330u0<;tyFx4Ie|uU@@+(_7JzWsKt+@(vG zE?&I&;K74Oj~+dI`0)S#|GX>S{sEf9nB?v5BFwWpW*U&gS>O>_%)r1c1j3A$?$&`+ zbb7ithDcnt^>-9vR^(ASk`Z(H?Y95*Ig87lJm7F+YM2mp#wANxwxI0OBe&-V9?bu) zD%vt}@vK%a#fJuuUpFW@oRhtmsbOZMj<25Dj#c zYKdz^NlIc#s#S7PDv)9@GB7mOH89jQG6*p=vNABTG68Z;tqcs_#w13dXvob^$xN%n ztzi!1%_l$&f*>2xGILV%5_40nN`MRoi+IC>f*1IJl2Rba;QX|b^2DN4hJeJ(yb?V> e*ARs=V?9$nLj!{^MGJwd7(8A5T-G@yGywq1Tgg8F literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_10.png new file mode 100644 index 0000000000000000000000000000000000000000..e078185377a6ddab39dec90a4fb90836b822273c GIT binary patch literal 438 zcmZ`yPbfoi9RDm&{_gA)gon;f*7?~V=*-|y%9`Fy^g?|0KLxhoCz1^|^_j}Ra<7OSj;daJc+ zgrIc7<#Pe&dlh+EPh2+_aQ7p7-|$YPDe4LMfaMlIO9MY7X>Y(h13n@Ee*lxb4(8X2}~zriTKk0 zfg|11D+OwbAL5BAWk#M>c$Efpg*j$AefcK0zUYo5pGpbDzgG~z#o72WI R_LVxJEqFyq$o5B8e*qC;aJv8i literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_11.png new file mode 100644 index 0000000000000000000000000000000000000000..d04b1f525d80c3a0b089e38f05cb77d8d4b2d42b GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15{dyn zA+G=b|7S2w`N_cWiGkrM1H*p?hFc5_+Zh;cGcasnVE6*mw)FoMpkl@(Z+91l4pvzY zAcwQSBeIx*fm;ZK886+f`vVkI_H=O!;kcfhpulTjWWeDNacW(_!VO#+$|YJ;1Z7&+ z&B$P2IB&xAp}lX~E}(MN64!{5l*E!$tK_0oAjM#0U}&ssV5n9nO2Eg!yLw&Pk literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_12.png new file mode 100644 index 0000000000000000000000000000000000000000..e3d1ae006f2a0e81e269836a992e4407558017b9 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lrRhM z32_C|5)2GpKps$*fguy9mw`cyfx(V}K^JHx1A{gLLk0swJOhIt1A{38gEa%g|NsA! z=3Tr8)XA9S?d~G@XshimAcwQSBeIx*fm;ZK886+f`vVkI@pN$vk+__kus}H>B`M8O zFd;Shxr5+?Cy$;v3O;!HSbV{9VMgaS44n*5C%przS1oakC`m~yNwrEYN(E93Mh1q) zx(0^2Mg}2t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$pehDW LS3j3^P6=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15{dyn zA+A9BCj-ML28O2$4F4GzZZR-yXJEL^z_5jZ;R{gY|NpuLQ(prWF(!GtyKrS(_!0)> za29w(7Bet#3xP1>rMq>1fP&JVE{-7_*OL3?0Z7Uh(Ph@gC zrTDoAs7$rQHKHUXu_VKYk@7#dj_7+IMBxu#YI25(~$BTzKt z=BH$)RpQn#hwfyhO+G+bDUfV%ep*R+Vo@qX kKw@TIiJqTph(ejMo~fRpfx(xeg+Nsdp00i_>zopr0AopU!~g&Q literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_14.png new file mode 100644 index 0000000000000000000000000000000000000000..88cd89ab4d00be3ca1f6a0d0c49003d5075a41c3 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fi>_1EhE19|<@egFUeulx{w3dmt93GxeOU?`h>)&j_5O!9VjVd>Af83^QX7I;J! zGca%qfiUBxyLEqnf_|PZjv*Y^eR~h`9#G(6=9RV(evra^qkj9fhE>l>C)FA@G+tyh z(UMr=C_YL0lU&r5sLKzm0Xkxq!^4042^XS40VkRLJW45bDP46hOx7_4S6Fo+k-*%fF5lt>Hk z331J~ufJCR|I(Q$|G%HPeRb~dFMF?Dm~rFMtoxT&{{MIB`R(<$uFSc4Y4+2b>y97j zeEV?Q^@}rapI`Fv*{+YTHa&Z=^4j_7zkk2Fb9MfW3o}pdop|Z=)P39Q-#_29e@D~P zdn+!Vnfl=B%K!iWYropS0<@8-B*+iwg|f+KEr2}6ByV>Y#UnYqVn7aOfk$L90|U1Z z2s2)~TlWVjSmWv97$R}GwEw11lL3!wF?Ud;i|Z8E$bbK}eTy~qd1jvca&D%{a?y)L zw>mwv!Wi@%mbG7RYt;TUp<8x`kxK|$-q*h$bK>6a{u99?9GlN9u}xcfAB%mHXSu+V z#JLq&j&EhQE-34aYC1JP({Zizx9PLWdT-^rJL&T6|I1u*hUNU}9`945bDP46hOx7_4S6Fo+k-*%fF5l&}f# z330u0<;wNz*KgdoaqZf*TeoiAym|BX?c0|wUAlVpYFA_9g9i^5%$)gluH2nFcP?MP zoRyLB@ZrNpj~-pTc=7-L|LwWA)q&4Aw=iXV#>EfvHH0kP{I}^7taB(UZt6uh# zx^W`=?txpsmQQYQe!SP1f77b66&v(I%zmU?Y}OT9m@Ssm|MbD%US~b)l<@pRpEms! zvRZ67LH+nE@8pR;Tnf}q$~{q3`qv!mS)UZ&lC#>)cfQT}r%jXgD7o|G+}8NV6er1% zwUx2^FVJbKC9V-ADTyViR>?)FK#IZ0z|dINz);u7AjHtf%D~9V1jseDGB9`>lNf=b zAvZrIGp!Q0hB=Hkp8z!of^103%t_5l%uTf_0WugY;*BCC8n*x?r9hIw`DrEPiAAXl l0g0J;C3=3YAqr*2dZv1Y1_ob>76Mf45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z330uB`}VbK*DhbaeCg7qD_5>uy?XV=jT<*_-n@SO`mI~Hx*8iVUc9(q=FGQqO>_%)r1c1j3A$?$-SQ z3if!qIEF}E4)wn%bXb8$$t=)$YwY*`^4530=Ecgn2(mD0-+rdLsLI*gebR5gSsP4^ z4(^w%5h~W@@Z>i-VEJ3Krqh6L_N+sjy$qfD*M1h+HZ`dDoP6QL>xIG*8{Z#1aa+i_ zUO_QmvAUQh^kMk%6JHu7RPhkwJ)|k(Ggwl?jk*YGq*XHYPCwMMG|W zN@iLmZVhu7Z$1HP5CqwfmYI{9mzbMsRRUx%Si~Fa%WqTyN=ktwgY(l$$`gxH83GbB i^GfvmTtgJfjP*?Q3=Isv6fFd*V(@hJb6Mw<&;$U45bDP46hOx7_4S6Fo+k-*%fF5l&}o& z32_C|zjn$>Ffe#AFqi=qFfe2SwKFh?F)-LMFz5npWnj=|V8~!#h-YB%V_-04V6bLj z`2YWZ=S_2v>5NIKYk@7#dj_7+IMBxu#YI25(~$BTzKt=BH$)RpQn#hw=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+A9B*G}1=3=E$b7@jgP{AXae#lWzgf#Eg-!xjdHFF=w1|L=d~017fNCV9KNaLZpm zasbHTEbxddW?2OC7#SEE>lzs98X1Hb8d(__S(yO2 zrd9?9Z(|Z8P&DM`r(~v8;?^*S@#Yht20@SwX_+~xd5O8HRwY0NgGIdQu^JI^prjN? uGB`i2q&%@Gl_4N8Gp|I?&oxA$%vjG<&(Of&OVL80Dh5wiKbLh*2~7a4=yR9= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_6.png new file mode 100644 index 0000000000000000000000000000000000000000..8a3b6fcba0b22f9feec09b86481962cd2368e02c GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lrRhM z332`Z|NpO@vJwmoUO)k$0tSXmpmqiZF$M-Z1_oWAtqcs>3=A0z4Dk#Mehdtz3=Gx` z3?(ZVd4MJ`CV9KNFm$lWdH^|`1s;*b3=G^tAk28_ZrvZCpq8hLV~E7%T-fYKdz^NlIc#s#S7P zDv)9@GB7mOH89jQG6*p=vNABTG68Z;tqcs_#w13dXvob^$xN%ntzi!1%_l$&f*>2x zGILV%5_40nN`MRoi+Hp6QrERWNhy$IaDG}zd16s2LqK9?UWuNcYluRbv7V`(p@G4d RqJ= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_7.png new file mode 100644 index 0000000000000000000000000000000000000000..408096a05a51f826a9af53ec058069152526846d GIT binary patch literal 409 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15{dyn zA+G=b|Npg9_9p|wCkBS63=IDn7;Z5zY-eD&&A_mQf#C}SgO_15P%Q&vlDE4HLkFv@ z2av;A;1OBOz`!j8!i<;h*8KqrDto#(hHzX@PEg=AFf!n9h&Z(_VBrQX4doK8DS|Ss z>t2xGILV%5_40nN`MRoi+FR5qEc(1q!dUp tI6tkVJh3R1As{g`uSCz!HAJDzSkF|?(7@nJ(L$gq22WQ%mvv4FO#o3ua4i4; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_8.png new file mode 100644 index 0000000000000000000000000000000000000000..78e412aa2d437bf97c5cb2be258a2fb49c666605 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}o& z32_C|45ld(3=Ccj3}!$D3=Ek-?Fo z|NsAXWyfQnUdAMEcNd}RJvktQI14-?iy0WWg+Q3`(%rg0KtU}}7sn8Z%gG4~BokVM z4GtVRbEs=kOYhufVb_N4+3n)44gK*B0{a(UVP){^VVEnqXZbXsF4Yp(h?11Vl2ohY zqEsNoU}RuutZQJXYh(~&Xk=wzWMu;6npzncyp2hWK+%w!pOTqYiCe=Q#+y%o8U#T$ zq-Ex$<|XE)T9p793>NVgJI-dT0!m7OB!lzQO3D+9QW*jgGxJLH{9Hp6%8d0)^$ZOR Tz7#D4s$%eT^>bP0l+XkK_o;If literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_9.png new file mode 100644 index 0000000000000000000000000000000000000000..c3b5ef0a394ad4e6940a09ac87152ce79211cf91 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+A80!8GM31H&f$({k3=HQ@m_D@kP1^-ju3F+6QIe8al4_M)lnSI6j0_Bobqx%4jSNBzjjRletW1Dh zQ!4|5w=szkC>nC}Q!>*kach{vc=HKRgCNL;w9K5;yu{p8s}dlC!6M%B{HX|#|D`~Z u!TD(=<%vb93;~Imc_n&&t|1C##(JiDh6V;-iWUM@F?hQAxvX45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z32_C|_JKZ6&3Gjk7`zx5%z$bb7&3t-FffQQFxW9L=mITfV9;h@$Y5ZIXJGJSU@&E1 zux4QR|Np*kA|78Q+a2eKXUHi$)hbg2hJWo-L7-sfWCr8%l&{?Obqco40~&|xfcNS zs+PD$l%yn=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;166ygy zA+A8$KG5f>8ShU9hEEI(PZ=2gGcep@VA#&UaGQZ)3j@O!pveFKtrJ>S0hKZ)dAqyt zG;R(|268wHJR*x37`TN%nDNrxx<5ccHBT4E5RU7~2@1RhMw%QB5o(D7vo!YxGamAY zW=k|!lCoG^O^Sg*+M9)8P3ZO=KpmckG8io54G&!2 zWeJp&0!aqvrFVdQ&MBb@0Hu|2 A-T(jq literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_10.png new file mode 100644 index 0000000000000000000000000000000000000000..fc44df7135d0bcc203903fa91efee6275ef036f2 GIT binary patch literal 447 zcmZ`yPbhd^a35^0g`k9r~$eG3q1x*z!(q#{D1@K1kO2U6&>NCeO@=# zHH{*XifM6p2GHt@#XY_(=V{4&Zdb_g6q63>q_`9<(TnN5)g9g5!`1!8&2`3{y}P_! zGiS4H#@5VhAXkFOCeD^j+5^fqtDdkLmsLfGr4$0#7;m>Q-eO}R-X<`c&`#7LF!nVf zhyMg7rsB!O!vBGN?)i-Z`r?N~a$K2|Clo=Y0nP}|j+!#tq}CVJp{ayAFQ*g)=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+G=b|7S2wd1}V{lY!wA1H)4WhW`uo=IjdcwSb&U){42`S| zjI2z6TvICpgSRn>5hxmR^HVa@DsgL=!+7%vP=gT2hP2F_)V##pRI3sogTXT1(D07r z7Es_xfn!`5rw1EuV>y<>%~?L{a_4!AgS zaKK3smYWm@#Yy2rNn}E~IZ4g4ql3fqe4p?0eLg+Qir;N6t||s#_IjiMX<4=kbE!9Q zrM)D1!!Dl-NUfIqX!+z#$$+~9`&ZTPWUL`izz59K1M`c(H?8L1fC&bC1Oag!sEBVI z_q0*qRJv7}G~HsZ1Ui8hIsl@C1LZ(Fz|mKr5f}jm0YBgXT7gU^vvN?dMzCq9%Pm=E zPey4*QQXs?1WGK~GTl7P{m`<}E4kFl+fZ<`CK#5|cK+ya`|>E2jMwgJFVC+}^7Z*e zlXdA)`N)B?hppqY`yImS47tw;Ylbd{5;_S4#@ji@a{^O&L1cp1Ox7VX_Bo*S{Q<^e z;b>&~e_+FO_d?^TFSMbVyX}=@5@C!ygc4Ytn literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_13.png new file mode 100644 index 0000000000000000000000000000000000000000..0e75217246201e52d8e04ab40ee7e32a6b1ee822 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+A9BsTuE228K^S1_Q%?28LS<4BHtPZZj}!VPN__)&(?f;OY=aei5=Fra)v@ z(jrEN8(W!$Uj5j~22`zD;u=wsl30>zm0Xkxq!^4042^XS40VkRLJW-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIE+5bC&=B literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_14.png new file mode 100644 index 0000000000000000000000000000000000000000..80dfa00e043f15c2c97787bbedce462eee18eccb GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+Fi>_1EhE19?iOto_n`|NsC0cx=`jAfKru$S;_Ip=|P53m}g%$=lt9^+*28<3J8) zfk$L90|U1Z2s2)~TlWVj=<4a>7{YPAwD%zA0RtZ9tAcx)rgA>^kQvU)6|CD+K5-EICJZ@)EF;5&2uVRN8?swJ)w zB`Jv|saDBFsX&Us$iUE8*T7KM$RNbf$jZRT$^^(YwK6bx845bDP46hOx7_4S6Fo+k-*%fF5lqd@D z331J~uLm;!e?N1r{{OWLGyea()Gyt4>Gah7JDM(?nR4UOtf%)@Ts|}P!PS*Ou97M1 z?W=Qtf7uHZzkhk<^V{ohUYh;%=DOntI^RCrcKzba+vk^je75W3t4+@yth{!9`mHN- ze*b=TU2WN@SD=2s}ok7PzXD>)8h(5bne{7K5dN`+#Xyf4jy<}v-94&{^!{>(b`vLdAvVq z`PFI7&p_w7s+~=|7b+@j9bbl(RUPMvO5pcAziZ7Gn-!DTOezm0Xkxq!^4042^XS40VkR zLJW-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~lo FCICNu_%;9l literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3ea10f6028bae3fb8a3f349e490d8ce45c034e86 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}o& z332`Z|G#~p&r>sA2?ho)1_m>r8U}_;pa~2NVhjv+3=FzJiy0WS85lAc7~&Zi{1_Na z85pb?7#7V4P68UjnB?v5!qCAg>jC6&7I;J!Gca%qfiUBxyLEqnf(D*0jv*44lM@z5 zCZr@JF$sAz%xs;?JM;XJa|cfzZP7V!_VDR;odXB-6*OAz2fSipi0@(8Tcgdr0H{~B z#5JNMC9x#cD!C{XNHG{07#iyu80s1sgcurG85mia0J)}C1_p0q5+hJFIjMPxxv5qqKn8*UdmlDUf7vep*R+Vo@qXKw@TIiJqTp ch(ejMo~fRpfx(xeg+Nsdp00i_>zopr0D6LUHvj+t literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_3.png new file mode 100644 index 0000000000000000000000000000000000000000..452a33f4632f84aaa910d2322612f275fd9ef34a GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+G=b|F;kHd1}V{lY!wA1H)4WhW`ul*!&%@FSR?$clWj^ yP*Msc8JwS1Ql40p$`Fv4nOCCc=Nh6=W~^tbXJ}yXrD!2g6@#a%pUXO@geCwgMsEWE literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c9bcdf3c4e5851b502662c2b18b0e6789dcd999b GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z32_C|zjn$#HRF|FVDMsKFaxS#V8{fTz`!8Jz+lI~pbNB^fkB&rA%lS-o`J!Sfx(o4 z!J2{L|NsA?VSyJMySIh+L^k;M!Q+(IDCcA-F81~j^b1wku zRV{IiC`m~yNwrEYN(E93Mh1q)x(0^2Mg}2R?+VW;0VprjN?GB`i2q&%@Gl_4N8Gp|I? e&oxA$%vjG<&(Of&OVL80Dh5wiKbLh*2~7Z)V0SbC literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_5.png new file mode 100644 index 0000000000000000000000000000000000000000..5a2103989e3d52b02e68f2d55e2658816199c8fc GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;166ygy zA+A9B*G}1|X1qTc7(OvDJY`_`&%khtfnhrX!)*qJEes4_fFl3@d&ulN1XRkH8OY%*@Q5sCVBi)4Va7{$>;3=*)jVAsLpZJ{Cn)e57-@1iM5rYS%+lN&%y`Hn znk~^_Ny=hvH7N!LX>S&WHKE&g0ClLAxJHzuB$lLFB^RXvDF!10Lt|Y7LtP_-5JMv? z10yRFAlKB&z~F66Vg!nY-29Zxv`X9><}luT0@NS~vLP)qCp9lIH`S^H$Y8LHH$A?u zP5~$>1(FQTPb(=;EJ|evNX*PD(erZ+Q7ALkGu1ORF!)lm5U7g5)78&qol`;+08X)T A6aWAK literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_6.png new file mode 100644 index 0000000000000000000000000000000000000000..a65b1d35d4265f005ae446fc044ab4fe6eab87e0 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}o& z332`Z|NpO@vQN!;B^VgI7#PfeY8V(YfhI68h%qqOF)-)?EoNZQW?;x*V2Ed6@MB;w zWni#oV7OJ-22{YnnB?v5!qCAg>jC6&7I;J!Gca%qfiUBxyLEqnf(D*0jv*44lM@z5 zCZr@JF$sAz%xs;?JM;XJa|cfzZP7V!_VDR;odXB-6*OAz2fSipi0@(8Tcgdr0H{~B z#5JNMC9x#cD!C{XNHG{07#iyu80s1sgcurG85mia0J)}C1_p0q5+hJFIjMPxxv5qqKn8zopr0EIYqWB>pF literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_7.png new file mode 100644 index 0000000000000000000000000000000000000000..16935efb4fbb3bd8fce2e88eea6a18060a366431 GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+G=b|Npg9_Nf`~PX>lh3=B^h82&Rb++twZ&cJY+fnf^+!xsjI+=i$3f$ABPyxm;OkH}&M25un`X1sK_?hjB<&C|s(gyVX0f&#CBktT;jgj%A&EX}>ajE6j; z*%A$wq%77}lVV_y_GV#N6S{o|P={)XYeY#(Vo9o1a#1RfVlXl=G}bjR)HN~)F*LF= zFtRcMa!sua4Bo~hMxbcO%}>cptHiBg4&%)yKn;Q*8`3g!Qu7jXQ>{vX345bDP46hOx7_4S6Fo+k-*%fF5l&}f# z32_C|45leh&3Gjk7`zx5%z$bb7&3t-FffQQFxW9L=mITfV9;h@$Y5ZIXJGIHDraD@ zW?=aL|9|NX2BR0prC=Li(`ny<>Z6~ zk_jmZNlZc>4KrJ(^3FVev_SR@~F97OQ zEpd$~Nl7e8wMs5Z1yT$~28PDE28Oyu1|fz(ZpJ^^oQVJv)oS#-wo>-L15RjOeSEA?V d8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIH;Ub@u=O literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_9.png new file mode 100644 index 0000000000000000000000000000000000000000..abc89033c7f23eb6cd0263905979492885df8cb7 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;166ygy zA+A80!8GNm8ShU9hEEI(PZ=2gGcep@VA#&UaGQZ)3j@O!pveFKVyBNS1FB?9@^*LO zY1|x`4CHVYctjR6FmMZjFyp1Wb$@_@YMw5RAsp9}6BKw2j5IkMBGeKEW@+vXW<2B( z&6a4eBxSL-niK45bDP46hOx7_4S6Fo+k-*%fF5l$amj z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QMu2ba{T==>Px!XZJ}wxuSpLgz}4< zCg=7^p586??YYy#OFFM_o4tQv{p`Bo`TbI-_lSRZXmkI9_N&{bzh1k(zGMFRiT$U? zwwDgcetGKf{D$$}bD9q>Xg@oYRswV)W0JSKi!@Whl_fw9XMsm#F#`j)5C}6~x?A@L zDA?@j;us=vIXU3~lf=v!kq#!>($?%9&z?Mb#(43~o|-=jQ4Rh994_3(T^&uP9i83_ zW+`YMJ)pqL7QiUUrotGxLczzOk2lm|-c;E$p$(h{-kME6yiOS~iiQfrd-%$wEwq|( zC4hPM5>1_RoPyUbu}!qvRrM>NluhB#g%c8Q! zC8<`)MX5lF!N|bSSl7T%*T^8m(8$Wb$jSuBHMKG@cpH-#fubQdKP5A*61Rpqj5nVE zH3))iNXyJg%}dNpwJHHJ7);_#b|l_?3Y3%rNe1Vqm6RtIr7{F0X6BXX`MHKDlo{)p X>KPgsd?{K8RK?)w>gTe~DWM4fpd0TK literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/fillAll.png b/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/fillAll.png new file mode 100644 index 0000000000000000000000000000000000000000..128fb518e417b513d616c2c1de8f6eee41d5dc69 GIT binary patch literal 634 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lvott z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QMu2ba{T=$k^EU>^_MnSM+b3P=0aK zP9?f?J(zx{oD70{K8N#5=*ruVkp%m#8e3p^r=85p>QK$!8; z-MT+O!Ddev#}J9j$q5ITBxcTtbTHADwr1~m_TaN#!Y>S!|U z==5GNOF{GK0R>*R07gkR6~@RF3O){fyrB;BrplfPZQwNU)@=IWb;^KIG*lqo!&feC zq1B8l0nD?PXzHBf6ufqcZKBn#s$T)6Yzl`ioRD}UFYL3PnW1(o=hwyaZB>BIQ7v(e zC`m~yNwrEYN(E93Mh1q)x(0^2Mg}245bDP46hOx7_4S6Fo+k-*%fF5lvott z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QMu2ba{T==>Px!XZJ}wxuSpLgtD=* z@r#=#=k`gS-Yxd+xzoc-IYX{LlLOMo2C0*}aI1_o{+5N5n| zx9$&6u+7uOF+}2Wa>4;7iJ3DZ9Za;Pt=T)CJ$dwu@#333HGdSM8vFw|T)2(9I+{#7 zI=vUnQqVklK!KMnfKif7g)wr4f{#NVua*Ko8xPl-Hwo*Md>SIXIFE#fHFB<4)%e5d z6_)|G>47E7tZu02CKmd2Y}m%vapme|^M+N%EP`&w)Dr&BNUD-$Saggl^vi5Z4WNru zOI#yLQW8s2t&)pUffR$0fuXUkfuXLEL5QJ|m4T6!36N`QWnl0&CNTm45bDP46hOx7_4S6Fo+k-*%fF5lvow?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QMu2ba{T=Xy(kBXZJ}wxuSpLgtD=* z@r#=#=k`gS-Yxd+xzoc-IQ-1m1}1adeFJR*x37`TN% znDNrxx<5d{9#0p?5Q)pV{V#=@3e$q+vx9@a5 zxci;dHMWfpo#D7OEPa*Rjg)PN%8vBR^$WNAGU?y<7Dp}~SFxTCjK{>p5+3buyvCL? zZ<1B(%eDi)>2E%>Zs9mBT0JHG=%KAY)TVphw&0Ab*uGr8Z~5lh@`bVackG8jza%@s3x;(?Mn+a literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/stairs.png b/buildcraft_resources/mods/buildcraft/textures/blocks/fillerPatterns/stairs.png new file mode 100644 index 0000000000000000000000000000000000000000..7df07d486dc6dd23bb5056608d2bd176237327da GIT binary patch literal 647 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lvow?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QMu2ba{T=Xy(kB#>U2H_engtqJQIr z@{5}$=k`gS-Yxd+xzoc-I;3=*dp%toLnJQe_E!rx1_&HAU#UG&M5){3>EEvR|F2q9>l?TIeLTl<|IOn% z7w2!1DieOUV-@T7TXpQ~b~*CPvHj(ci*8=X(=+Mg_cl*26W5K5#+MoxpRsw>HMag{ z&x*bnG1)e_f;l9a@fRIB8oR3OD*WMF8lYhb8rWDsI#WMyDvWdh`yS{WF; zjY*6^(U6;;l9^VCTf-d2n@@lm1VJ{WW#**jCFZ7Dl>iwGCh-;45bDP46hOx7_4S6Fo+k-*%fF5lvow?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QMu2ba{T=$k^EU>^_N^GiN@zqJQIr z@{5}$=k`gS-Yxd+xzoc-I z%y{W;-5;P}yQhm|h{WaOgab?xGiO9Pm}pB|vv)ju^5_}k#W#Cu{wPE>_y=&fa2t1Z zG?{jEdM}uzpn3Fw0xw$tqol&LX{<~W8e~EQ)D+IQX)QQ#itm}$A(k0Sr#RH4iq2TL zDobJCgk4N$oOlgZuH-ZG^p2P#th8n=vr_5TFT4w0@i?|j+{k&ue%XvTc7~}pxb*Mw zPwECbNwvf^q9i4;B-JXpC>2OC7#SEE>lzs98X1Hb8d(__S(yO2rd9?9Z(|Z8P&DM` zr(~v8;?^*S@#Yht20@SwX_+~xd5O8HRwY0NgGszuSpJ@qKuIZ(WN?03NqJ&XDnmeG iW?qS&pKFLhnX#U!o}q!km!gG0RScf4elF{r5}E+D!}V4G literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_0.png new file mode 100644 index 0000000000000000000000000000000000000000..69a55126ec174a0f74f59def18cfff09eb1e1d81 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lwb?+ z32_C|`3wxt-k4qjvKUK({DK)Ap4~_Tagw~D~i!I14-?iy0WWg+Z8+Vb&Z8 zpdgQ@i(?4K_2dKvULenaf${jN);=IhwZt`|BqgyV)hf9t6-Y4{85kPr8XD*tnS>Y_ zS{ayH8JOrAm{=JYxIOz`gQ6ifKP5A*61N8P-TnuF8U#T$q-Ex$<|XE)T9p79345bDP46hOx7_4S6Fo+k-*%fF5lz156 z6XMFi@IhAgKLf)*F)<+dOkN&H-qq3qk{=lu-ZL-&H9t{P`>(DJ6akv{kb&Wvsi|pT zU?9*yQBk1aEeVPL%*_AgPYet? zG3##@MCWqse_XP3ir32E_iL^nSFo5qsbfau%2m=y5;JDXCQK7&iYu8Twrh`*!jJm` zy-6|mH~ibJcuJFPj#zf?l&O}ThLiRQ{$8WewdTyrum#oS=d0GQJ)y}J?6b^x_KQU( zj_LaxjAP|mHN&#yXRn=nWBalNPrp4B+`4?@`K8yE3Z6fFludtq-INQB7xTVdJN7%_ z)5n)}Z>#RVo*yc+Z2u)L{jZC*9`plxPqoA~q9i4;B-JXpC>2OC7#SEE=^7g78kvL` z8Cn^bS{az=8kkra7`Q$AUW1|`H$NpatrE8e^WFXjfEolrHl$_dq~;~&rdpK%84L#T VhUb|Yw*e&?JYD@<);T3K0RYPe3?l#l literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_10.png new file mode 100644 index 0000000000000000000000000000000000000000..8c650ce7d3a00a8157c2d9ba6d8cc6b878e811b0 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G+y1@c;k- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_13.png new file mode 100644 index 0000000000000000000000000000000000000000..ff5d5091c0dfb7e3c384794cb88c726f9e316050 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLur>mdKI;Vst0HO|59{>OV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_15.png new file mode 100644 index 0000000000000000000000000000000000000000..39a7fb531a609b856066bfd34451a26c43b5c176 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu9QL8X+T*9Pgg&ebxsLQ0I9rGyZ`_I literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_2.png new file mode 100644 index 0000000000000000000000000000000000000000..edfd003e9a37e70a273454ecd141fd33ef003f1d GIT binary patch literal 935 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5)Mppq z6XN>+|NoyqfByUT@AvQDD^{#{^X5%WO-)i#Qba^VNlD4KZ{Pm@{rl_JuRnkOJbCgY zARr(xF!1~L@1H+^o;h>o$B!SseEIU@$B)p^&^veTym;{FMb?IyyEtH=jR$ zzOS$E^y$-Ewrn|c=+OK3@3(K?zIN@}HEY&v+O$btUf$5qaKnZTpFVx^^YfFHm0h%G z(d*Z*fre*iXFEGP=jP@DjRo2cbdQgZ574O=78aSAnfCVfK=VyaO@Z!raBy&PataR* zx3sjhwYBy1^wiha_ww?xwzk&Q)ip6O0lG&+Lj&k?b8~Zbb#)^nBcP=~mn$nP8yFZU zDJf}dYpbfNs;Q~vGcd@%)HnhRV#ksoKTyt(!M5jk==crQw-hRlU_oBUf2Km$+{@wBpN5 z&R6_5S{343(|I=>(3Mr(y(h1u_qTzALQ2SvptY`M@~@(`oE`ejX7&58O;5LG)8j7u z{dDWy%3>jF$Bf+$n_{#}t*cl5{nE(v@Z!AB_vB^dB!zXn`eMspT=Vx+@0s*C=gY^N z*=aflOlF=rZRYm)-*wBWuP-fS5=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15{dyn zA+Fi>_1EhEo0^&i1_mBEz<1-ujiREW|NsB5Sg~T-v}ySa44a29w(7Bet#3xhBt!>l&XcXjBbt`3`Q+e zdUzdq6h+0w)14KVJ$CP~V3c%IXcL-{xQb=TWQU#rRaJ2Vwi%Y%wp)| zZN2=UM1r8>8bg=d#Wzp$PzHk%687 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_4.png new file mode 100644 index 0000000000000000000000000000000000000000..ac24143bed0757c783e63b17eca85401ebac0d45 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu T{)|#fpd^E*tDnm{r-UW|RYg>1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_5.png new file mode 100644 index 0000000000000000000000000000000000000000..2d71270448640f1b84ef766a7f71733d096e94c8 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0I0K6qW}N^ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_10_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_10_1.png new file mode 100644 index 0000000000000000000000000000000000000000..1807683547a7d31212e28baa483643ba4a8d722c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0IY3P`2YX_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_10_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_10_6.png new file mode 100644 index 0000000000000000000000000000000000000000..e9115c40a69bfa209b8ca5727fece000c6468089 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu7TA(b0r>mdKI;Vst0HtG8fdBvi literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_10_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_10_7.png new file mode 100644 index 0000000000000000000000000000000000000000..fb91699ffb6603cd89d6018cf46d8333190a89c6 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0Jq###Q*>R literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_0.png new file mode 100644 index 0000000000000000000000000000000000000000..69e5b94f473c60df45df77ad797c29a26211a2db GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0Qf{ytpET3 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_11.png new file mode 100644 index 0000000000000000000000000000000000000000..bebc2f78bb77e5dffab029830f437ecb95d458be GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu#*M2~022WQ%mvv4FO#lLaRaF20 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_2.png new file mode 100644 index 0000000000000000000000000000000000000000..2e62e859fb0fe2f60ff9f53dad4ae25f325a9835 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu%vvV4y66r>mdKI;Vst0HYODPXGV_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_3.png new file mode 100644 index 0000000000000000000000000000000000000000..24a2b30f6491c53f7799634f46bbc5774ce1f056 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JsZPvj6}9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_5.png new file mode 100644 index 0000000000000000000000000000000000000000..042e9af6684ccb02eb9144af09dfe803b69aedcf GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuGJPCJ^*DIJYD@<);T3K0RX?3R!jf@ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_6.png new file mode 100644 index 0000000000000000000000000000000000000000..14acc6e5780b8e964bd6033a26e766e49ba550b0 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JFhWe*gdg literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_8.png new file mode 100644 index 0000000000000000000000000000000000000000..8d831e86b4608f3b094307f228d73505dc15b327 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0I=9qNB{r; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_0.png new file mode 100644 index 0000000000000000000000000000000000000000..3452d3912fa02299180832b203c73494b99ddf4d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JF_ia{vGU literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_10.png new file mode 100644 index 0000000000000000000000000000000000000000..3737a6228916c8649a935fe7328221a974bafa65 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuRIva6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_13.png new file mode 100644 index 0000000000000000000000000000000000000000..d5fecb604dc83e1afd78b5fb033a90274bc86c6e GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLub%7 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_3.png new file mode 100644 index 0000000000000000000000000000000000000000..cc9cc238b218bf94144de69b05604ba9680aa3a7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J1|>VgLXD literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_4.png new file mode 100644 index 0000000000000000000000000000000000000000..5eec47c7ec13bbaf78e3fd56dc30b1a9fc7f924f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuC%mED}k~Mp00i_>zopr0InHT3;+NC literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_6.png new file mode 100644 index 0000000000000000000000000000000000000000..67ceeafc391b1226ae659c63e61bc9e5d9bac800 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu|JYD@<);T3K0RWxTQ|15w literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_7.png new file mode 100644 index 0000000000000000000000000000000000000000..102fb0c6b07b72e9b222716a7119770a0454d661 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0Hx!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G||7^8f$< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_9.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_9.png new file mode 100644 index 0000000000000000000000000000000000000000..1c29d04e6383d4e498bb702b0c2d51b434b856d6 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H2gp3IG5A literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_0.png new file mode 100644 index 0000000000000000000000000000000000000000..e173f6e5ca7e54f4d75fb98b26b7b9a4ef78ea38 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLus~-<22WQ%mvv4FO#lIzRY3p% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_11.png new file mode 100644 index 0000000000000000000000000000000000000000..d5620bedadd47f57e3f6e03280246e407fcb142e GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G|<53;+NC literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_3.png new file mode 100644 index 0000000000000000000000000000000000000000..0c6f9d0b125a50af029cd89eaa9a8f74b578fda4 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HWViR{#J2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_4.png new file mode 100644 index 0000000000000000000000000000000000000000..48eeb610ded2ddb5edb4ab2ad4cd5dc18fd8f2c6 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLukCm4xlW9r>mdKI;Vst0HW_yG5`Po literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_5.png new file mode 100644 index 0000000000000000000000000000000000000000..325489d794273773dae85625f5541f1e455aa4a4 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu5^idc|chPPgg&ebxsLQ0H}XdsQ>@~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_6.png new file mode 100644 index 0000000000000000000000000000000000000000..3b9a74eb15979a446202c7cbee19f833fcdadd06 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H$eFkN^Mx literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_8.png new file mode 100644 index 0000000000000000000000000000000000000000..d7720ac079cde7452fc70674f6133fc985a0066b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J0=iQvd(} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_0.png new file mode 100644 index 0000000000000000000000000000000000000000..1a200527caa835523457980d03004893f1dcce6c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U!Nst1Q-HDzp00i_>zopr0I{@HO#lD@ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e251b76bdc7d2b0bab96f2c7ad2050dd5881003a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U;j+MgOh8!%Pgg&ebxsLQ0IC2~yZ`_I literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_10.png new file mode 100644 index 0000000000000000000000000000000000000000..bc1e067009e778dfcec28e049cdc9af2e60dcc0a GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp@CHK`_DjW22WQ%mvv4FO#lJoRb>DG literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_11.png new file mode 100644 index 0000000000000000000000000000000000000000..d1dc8408a6aad66f262b2ef5cf5cd9eeff4473fc GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vq0yJxzWYFF22WQ%mvv4FO#lh$Rn`Ci literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_13.png new file mode 100644 index 0000000000000000000000000000000000000000..cd4aa5d5baea924be28d60decf4ba5178e79ae9e GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp>cE7K2M-DgQu&X%Q~loCIJ1gRQ&(| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_14.png new file mode 100644 index 0000000000000000000000000000000000000000..1d2a8224d58dd1c1295893ea298610f7c6c4981b GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp^2=V_A8(?gQu&X%Q~loCIIpvR7wB< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_15.png new file mode 100644 index 0000000000000000000000000000000000000000..03bfb5791959dfd60fe0e0cfe177fbbc1d2cac0d GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Up=p++G{`&#Pgg&ebxsLQ0PsLm6#xJL literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_2.png new file mode 100644 index 0000000000000000000000000000000000000000..933bd3e44e285befd9ff8d3fcdb11562f8e2cd27 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Uk$uGa9Y9$IPgg&ebxsLQ0I2p!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Uu}A!TJ)kUur>mdKI;Vst0HPjLI{*Lx literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_4.png new file mode 100644 index 0000000000000000000000000000000000000000..0600188179cf1fc06931c3983fa3d70ec8ec600f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U$u(=PUZ5<4r>mdKI;Vst0HvT*Z~y=R literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_5.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e04dc7c01692c2c84f539a4e92685e0fbf03ce GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U=|USTX`n2Fr>mdKI;Vst0G~!v`v3p{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_6.png new file mode 100644 index 0000000000000000000000000000000000000000..b65418eff2d5fd5fbd748906715298e478265de1 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh UnT2WgLZB>zr>mdKI;Vst0HNAcLjV8( literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_7.png new file mode 100644 index 0000000000000000000000000000000000000000..69b66497017c3daab97260cc7f4c831441cbc750 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh UxxZ1gIZ&3t)78&qol`;+0G#Yo-T(jq literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_8.png new file mode 100644 index 0000000000000000000000000000000000000000..a3badb4628efe899db7977ab3c6abc81a96cc33b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U#r!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh V<%+H{pdT3+JYD@<);T3K0RX7wRHXm_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_0.png new file mode 100644 index 0000000000000000000000000000000000000000..7ab3e8cdfcdf1e13af715fad337150ae4ecc0f44 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu V!G$SH76WA&JYD@<);T3K0RXemRd4_R literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_1.png new file mode 100644 index 0000000000000000000000000000000000000000..64ec572a0e0577bea3b9a2486a0aee258fddff5a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U;qu8-Oo6ftp00i_>zopr0IJMX$p8QV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_10.png new file mode 100644 index 0000000000000000000000000000000000000000..df9f70fc3ecfdb51b6dc52685cff9afc16888667 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp~0f_9n*l)44$rjF6*2Ung9iWRfYfn literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_11.png new file mode 100644 index 0000000000000000000000000000000000000000..cde3825511fe3af1ca3c7b9f73aaaf1f3a37cda1 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vq2bjNJAkqb44$rjF6*2Ung9b@RZRc@ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_12.png new file mode 100644 index 0000000000000000000000000000000000000000..8022cc13b57a730fd356afaebb755f8d8193b167 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp^?wQm%D({44$rjF6*2Ung9lpRjB{~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_13.png new file mode 100644 index 0000000000000000000000000000000000000000..7a16d1a563d5ebaf8074625880bc96af6078568c GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp|SO`n>s*g22WQ%mvv4FO#uD5RR910 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_14.png new file mode 100644 index 0000000000000000000000000000000000000000..4e9918ee972237d2672bcaed606d19781a24f5a2 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp~=!kKK(#x22WQ%mvv4FO#uI&RUH5T literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_15.png new file mode 100644 index 0000000000000000000000000000000000000000..0ac7acd8614ea272d7e02fd1f234246843ef15ee GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vq3NZiHIhJS22WQ%mvv4FO#uH-RR{n8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c5c52102a976005096f6f791357eae5d9b3eeef3 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Uk=?AL{Xkg;Pgg&ebxsLQ0IT*?^8f$< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_3.png new file mode 100644 index 0000000000000000000000000000000000000000..4c5623842e108975607ba1112d09c8a2a42abedd GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UvFF^cl0aDoPgg&ebxsLQ0I7ylyZ`_I literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_4.png new file mode 100644 index 0000000000000000000000000000000000000000..3c5c29cef9a47d97af649d90b0900b3325bd6890 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U$@QNJyMVF`p00i_>zopr0Jq{*vj6}9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_5.png new file mode 100644 index 0000000000000000000000000000000000000000..8d0665e26259fe9270bb8dbce9bf4f19bf4266d5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U>4JX&IzU+lPgg&ebxsLQ0IaxF!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UndNuJX+T*9Pgg&ebxsLQ0H**{k^lez literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_7.png new file mode 100644 index 0000000000000000000000000000000000000000..63055773dc4442060b80251ff65c8761d27dd0a7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Ux!(svpdr>mdKI;Vst0HXR-I{*Lx literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_8.png new file mode 100644 index 0000000000000000000000000000000000000000..07543e95eed1213c69dec082e25251fd379ff748 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U#XWzWi9lHfPgg&ebxsLQ0I9Q7w*UYD literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_9.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_9.png new file mode 100644 index 0000000000000000000000000000000000000000..40be66f53bd8ac2219f719354c81d0e7ec746f1a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UmdKI;Vst0G=sR;s5{u literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_0.png new file mode 100644 index 0000000000000000000000000000000000000000..133351ce878f729efe21ab6bf75e36f2151299d0 GIT binary patch literal 707 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l(-t; z6XKd}Uw^Is|Fn*xb&Gm>LWP|985UN0rKz!XCm80MGE_RT#%nX=8!#m4vn1&=$Llgq zh*n54U`*6!XmS;CVPlF`XYi9`&|_lKWoI>JVhmSiP+?#Q6=TWPWvp=LiPK_;*I|fO zV^C#giq&Q?VPlbEU|3dUvb4}>QJ!Img`fo!W2+b2$`XU+1zPh{Wjj0>x|mxfopd8CaQ_6qp!;q!~ix7|LuJ zD(o4oSef$~7|Kk&b^$%eQWE3`3^664=Q9F70r`wc-tI1L;=6vn1#&nGJR*x37`TN& zn2}-D90{P{dQTU}5Q)pCXS2l{9RwO4%BrmKUU}s$1^_xMF*Y_g?!Ngg>#YSJTe-3UbLG5n7K7UR_uqYR6JXhtw`-Ybo1$#*w}}M;^Mfts z)hPCzpRV0{`)^~u|3g>CNi3JX%45bDP46hOx7_4S6Fo+k-*%fF5)Yl*2 z6XKd}Uw^IsznZ;ma7wawd>l}{w6URvosFrF*Of0HcHO*c;^VdA@cyX0oXU=lvew3g z!u%uGu38581t%mf+^}K(#E=G(9P;vg^Jg#Jym95Wt@eQd_7P!o zHm~hlIIpO+Ijg2TASG$iq6Nz~Z*HD43FtzHz<};qvqG{n0~6z8va;ig3pf-M)$Hv2 zQ^t)>QZP_@yL^>FOj` zS9_-ZvV*0{t*dBn##L_~Td#fRtQ zs@qx{dAh}ym5A%=*oKE%xw=>e`7?2`0fU-BSRlH%P()kP!rxy+TPvS|!SwMRXP`J+ zNsu2ft}BIv*uE|Cst1ZNCV9KNv?N`KDg<&k3p^r=85p>QL70(Y)*K0--~&$=#}J9j z$q5Y1W@Tk%Y#IqEj~*mEdGLfuNajpWj{{?#93NktT^%DIpJU#Jh6x)wR?OJZvSG=T zEdmh^Zee~AagKqWkrA$<8V3%oShjBA%B5@9E?vBOIh)7@a|072vx{jdDJG`I+c#WE z->_-h#;u#n8MrK>EG&1wFy66iXLUtYWiv}nP3zaMk`fVr|1dK(H_19X9X_OdV4I7Z z>+vJUj;h~KRa0$djR_9Ae972o^QPjW&k9UGSzBF?sxD1^DmpcR(e1j)u~n~TMIGB! z<<`Lvo=IjdTqS zbd5|xj0~*|Osxz|bPY_b3=G_!eXl{$kei>9nO2EggZXa%13(ReARE#$b5ipXb5pHK afD8u1c*AoCUN-_I89ZJ6T-G@yGywo56jU$( literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_10.png new file mode 100644 index 0000000000000000000000000000000000000000..269781bf5881637d88befbfe8909361071c2e006 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0Ic;@4gdfE literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_12.png new file mode 100644 index 0000000000000000000000000000000000000000..9ea6c05e6a73f1c7187268b561c1265396da3512 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuPgg&ebxsLQ0Ikba1ONa4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_13.png new file mode 100644 index 0000000000000000000000000000000000000000..bceaf725d0c58ca293fcf7d2a6c4ad38f1b5c8b3 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IC&K!T!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu45bDP46hOx7_4S6Fo+k-*%fF5lsF&Y z6XKd}Uw^Ise{Dxcd{wz?N_@+-XF_V3?# z{CMr;$z5}20~Nc($CmYWuh_b^a$s5n|!+@9)%`+3FF_XpWAGB&+wU#nuezExkvk`O>f8<|k$mI%zdxiOuWp@vc;ctveT%}rtS&frXTFi_ zzlYlA?V059XG=#OSZR{UYMM7p7WgK$@y!w zRFukPYh^?vFEbmh43ncSiDgl(P1?agyxXwdK-Bj|{J-`%#zhU*(h_n{X8gg(x@xm^ zJJDekQDZX^SgG*|(dQh|qK$}eCrYd99DIK>)8$*cmw_8v1T_e&FqaK~HYPNf(;y(lhzcVc;Z@-J>+q`) zU{Qgvc=W9eD{7k{Jhsix|6b*sUl0UAEPM8B>F;=nOe#5Z z>U2}wP36Jo8!vQS=;{)LKurBoaY~#?>2R$2z|+_<*dp%j?r!Tp>&~(i|K^`IKiH|* z)7jSA>b|t*#E8%5JE=7L%kSSC8*4M{n4SDJFe6nz{Ilxm;zFW67@Unn?vH=;^;c6< z-$;c$#Wst@QfF3A=N$EDI}X@;>^*@;DXBx}lAA6*Y5#d(U|D>q)##z~-KuJ9eWmPF zi-ek-u1{s{qBL{)on{Hqk=m>;%j0EN*p^C{X{SrDyBvIVy@LVea=Kitj??DqD|2-` zm(O#0EvM%>Zrj2?M_v%@s}*XThh8oy{NX)66Qo2tIBWJg_S^S4co$1Z_etKm$45bDP46hOx7_4S6Fo+k-*%fF5)Rz?C z6XKd}Uw^Isf7XTvZe6=tPyU>A_5aM<|NAcfuRHv?{_y9=|NlSy|G)9rx9S5Q>W+M_ zI`HAb|NqNg{I5UqW&Wf88$SM@clZCK%l{jXe(OK;x9-rV$^-8=fBnDp+y9&Y|4+K~ zf8Oo?YhV1Ib?yJOtN%~`|G(wy|JuW!3bsF=aOMBZ>;LE8`akd1|Ghu{U;h7p;(4GU zUuzD1%Ghv!$@Bj`r+&@9^ItA+o@dYQhW+o8mt8ZjT($S-|IXvz)7RcjSaBn7>(dzz z|2G`^Sia-ANAKRM-LI?mz02SFEMn2c(0S)3-}v8g=5N8qM-@9>q^!6WvEX9NlFJo) z-b}sxzhui(->Ju3CmhJw_%L$W^|HP1QkPxLSa&aG-npQeC+vE6SM7SOTf9Urb(&Yt zUYGW5Au~^El`YY(TB%wv-=}wu zvL>4nJa0`PlBg3pY5lQ#0HR0F5}!OxPDx?m z`oPV>#o67_)#=UQ(ZsrBNovZ|C!!)#r-X(aWXgKAN$S+Bs9RRMs(vLfGCM0L3kMq) zb9-xNFKFmpJ9lqOv+@OtVD-p!@o+Zta(;jPeE9_p>*v=uR4X_K6nJFJSgaG^U>0Mh zWW<%xR@9NaCCw)%W>1cjlCW`rf~Td6rOr*mFf&&((H!rnT{#{`9xBSV!a5UJLnh9Z z5qm9>J&9Q?;mq0OGpF@WB48EA<^We1ju_K20iXs!kPT^>IjMPxxv5qqKn8*@_ax^22WQ%mvv4FO#oUFjB@}0 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_5.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd56665f7f73865ed103fdaad2d255d4a436bbf GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu+#8pd^E*tDnm{r-UW|QDIam literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_7.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1e5580a08085b16a80932b9415a58a9092725b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_8.png new file mode 100644 index 0000000000000000000000000000000000000000..ee373f1285121324e115c4481ad916db84aa1a40 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;164C)a zA+9FD`V9NGX4}_atN-6}qBx}8H@Qtu$&@vpfnlc9wmU#&Y$ZW{!9W@a@|Lkr1X7Gi z-tI0OZTF^D0Xdun9+AZi4BWyX%*Zfnjs#G!+SA1`gyXvISwpVF1_CY@1I;>bg+AWG z81JxQL5#x#;T_=ykz36e-+t9qe^>W$2IGP0%b6V}y518pw%GgM1lBT7;dOH!?pi&B9UgOP!uk*=YEu8~QIk)f4=sg;3=u7Qb_ zfq~nz?=>hIa`RI%(<*UmFyHNe0H{F_WJ6kJPHJ9aZmLxYkilRSZ+NCH^afCp!PC{x JWt~$(69D!$muUb1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_10.png new file mode 100644 index 0000000000000000000000000000000000000000..a6b9765984cba6638cc9afc8ff6c99c072d5432b GIT binary patch literal 581 zcmZ{fT}YE*7>2J+?Z+iW9VnJG0>z@qw>ir`BHP&7=FgmSWkKQAoTatY{0s`oWx7~D zxU^}61)ao95CRWsos2+;vN{Mlh=M4P@;rhO)U(45df|ER_kMov=YA7DudAfEycj6) zxE+4MP5D??Aa}KCW4l1%DO-yTo=g~ihl+&j2K_EO3vajm5Mm6w{Vi~*3SwiBlT_?G z3@NZ01obYI_RnV8_Df;f*Bo%3X&Cu1@<&eYSw#{8a0QM-hcv?;XcjfFLO(cQPz1pR zjnD>_&g-sd zQNOIz)COXS@zkyRSEp`leKeZ5HZ#$A(C03zG49w^wY*eWqbp6`nVi0z`esijXTAp8 zeF1;mkWN3Id;PNa^oyeU@ukJZA?@cE{VRJev!?N5{AopeMceT1p`PgK+J+Sk?7eewSTd!M&v lWngoDLwC>F$hlB7qH6NM(rH$Pw--!G6_3;FSg;32{{n39nH&HB literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_11.png new file mode 100644 index 0000000000000000000000000000000000000000..06ce1cb66296dc26d78da0aca26e8d1bed419504 GIT binary patch literal 581 zcmZ{fTS${}7{-5F+QB77T{tXZ1QUxkz8x$Zm2GTop5~liCn((7W@#;Feg;M4GF{jK zSLT7RpqrQlLLd?AW&}c%)kV-n6hwiP_Yp`??=HLO;(ee0^B$h}`HzHx{_?WQGN8O6 z;0+6|FUIN>l4~sM+678ZxLe%tWYq9GS}I)E7xsIYeY^RG5K}A=Zh;HckRF0%DW$(d zzXD4Ua7{r)YC7MxTN)FgX4QA9e&EBvA7RwSv!KFdI0}bk7@tnV&%sX{HN1 zplKcm3%ZGEAOv27L5x6%vbu=6h=M4R@;(9y>hZFRUU=UB`+pAq=l}MHg1-E`qC6nK z%I^sau3wJTE95See;8!{;OjHjr&9XLc4X_j*|JgV!Nqe@b=K?t&y+p%;4CU zNJB^ur!ASx)a1+OttX%5miNug%yb$*Kbv2;mu6Q6KBOOSO)nU0-`qEoTwGO=41AoF z<;8~gh!Kw(2`zRuA%LnlRGUMwsZL#WXo^cyoHoU&DawI`Ul;!wNVdgWn$Q1#VE2={ mtPE^i-q74~I&mhNOlXEYP#YcU(1xa`Ql-ip^h~=WJ%0gKZkbj9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_13.png new file mode 100644 index 0000000000000000000000000000000000000000..d5352aeb513d5feb4b31567cbd1ae9d48d7d8d05 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HZ8aIsgCw literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_14.png new file mode 100644 index 0000000000000000000000000000000000000000..199011acd2c17bf511b03e02734cea1515f82e3c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IhCS1poj5 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_15.png new file mode 100644 index 0000000000000000000000000000000000000000..9af142fea6e7ede1ebebd10f433f685ec45be71f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HelKTmS$7 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3f785c7f490b9f377e7b3e99669fe5f7d260c341 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuDLnv0wozdUHx3vIVCg!0A^WLod5s; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_6.png new file mode 100644 index 0000000000000000000000000000000000000000..74a2793247fdb550a38ebf41b9abbf5e71050159 GIT binary patch literal 567 zcmZ{gUr3Wt7{-6ACjLn>3>}gXlx5W5+uAfgQa9Px_N7j@W*HQ@<{Yc0BR`}6u8<&u z5^Q2Jw9BqWT|`v7@TQxGWXA6Zwijux#lBJ|PUnZt97HP(Gk2_>}JM_j|;c}H}f%_9r zGVzA@Ys;3jk^9)_{HXm*Y7u@&8Ha>Vb)jwHL@Tj_S`@#xt%S(MUdwcJe zm0WF+tE)bdF&a}NAHtbMbE^AWF8yh>`MY`M%XGE=s^GWj&csz2Sz~D3MsL`Ns*!V1 z0qly+ZnY^^yCY<`sftro99G4lD$2pdA6NbnBnEopeHZ^PsDIHhD}v4W34QUi(f)8E Ysv5GvezGn&Kb!v{bj|O{w)EWi3tG&RB>(^b literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_7.png new file mode 100644 index 0000000000000000000000000000000000000000..55dc6b441f776315d50f7844d2ea3221e8be82ea GIT binary patch literal 580 zcmZ{fUr3W-6vlsB{wbGKbfH+m2qqS7e9oEn5v`4_O`UVjuYXXuHD_rpH9vzQ(o7fY z53Wp&u%Mfm1w!CO7{myKD65O0iztX9DIw@40*UJEvWqUx`@GLN@AI7JO@)HK;-a!5 zpt#QO2@9^y)$(O>R#;cH2;?1hHM-!zi0M}}U$~(+>~k~ya{X5!=9oX+2&cT{crmJ2y-?E(xAaPH~@R)F>Hl^xPb$@!2`Ww z2tKHXX0SjLY=bh`162?MNhki2H3>mD3km3i-5?p{QwQN9?0_hEp$n?P51ZgNG(cg& z$0K65Y47Sz8@KHQL8&{w{?Vh$z%C3c=m?YmMde_ir+!&KvYhyCZ{t0kq$im;e9( literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_8.png new file mode 100644 index 0000000000000000000000000000000000000000..51601dc7e9fa3c0f1f86f9f3e215fa8842bf2844 GIT binary patch literal 580 zcmZ{fT}abW7{-5FYNbg<7Y-|sV4~6Fzd6fBv^KW(;hfuCpA>G*Sz61Pe}f`&nJ(4` zu1t-vpqrQlLSPW&dlo#--Oh}+@V%DTMMaSSdv!i zD-0;G7y-*Is7g-dgFED6BH#-#ubPEvj>Jwn|oRki_5JE?}up_ zu2-G=)y}9Ix5Q4x1u!W_lfkGMOy;o3Xi=IhirJu;EsC;x;pe%31c~0x?yfWc7i@dl lRuIA3;)Jg56Y-PLMBJjv0aHiw*TC7Z)p=KINi|P0MEw_zr%&Xb%Q~-gSmG*e+V%~Ji%tTQ~~i($Vn^y z9flNG3xWMUl=RPJS`WxzD$u05dh3Tj4*wCBds&_W6|TZbI3~-m51PacY|sx*7!*Tr zgAZE41T9bpWpEU#Ap(+4{3UAw{BQ+g&;v(6GRUXe;RYOpFu0%(YQO`#;Sn@K?^1SF zGU>ITUu-T+ysZ_cJJslR?#-+WJQK31-*ZB;7`Eq2$Ag(tX%2Xu4QlC!NGQv#G?m%W z0;7Ieu~e(^iyFr?E@XWuOKoLMNW9b25AAJTq)(Z6=&GV6Vx5--XVtJ>!GkM+dXHq^&_pYvf& zn(MgM8P=lq$oZ%MR;9{nu2Rfan`*7HD>Zh-W>#!=MLE3s>+(N>SYKy%*Tw$}_P=V$ kieOv*g|645bDP46hOx7_4S6Fo+k-*%fF5lwb?+ z32{AgfG?kcAvOLRP=hkfv%BBh>@X{fvJ^&iLQZ( zm4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;78nZFV!$>8bg K=d#Wzp$PykcTR-> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_1.png new file mode 100644 index 0000000000000000000000000000000000000000..13038d86354ee150ead4d4d0d425da94c259eca2 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLulkmBkn0>5QsrpA$HT?g?kW#Za5EOL;lqXqi_;}ph7Ryfg6s%6f{Hh z%gVZ#EK2&kA~P_tdR&m^TC>Y(Uj6K76i^y>UluR=J%!LPnXQoGpvUR(S9}Zw@;siQ zIzLieRrKz3xn4gWNb8ij`ME^AzwcMxudHvZ>q~T{kMdgQ+huiO(R3(SRO9<#o$udR zJ6NM=v{CPXYKrX5F!6kHDg7e*tbA?9(Xzgnv9s~+LTdEo@KkR8NmT!ZmVVg@qZ z+sF3jR$hwE;sKS$zB0IB8FV3uF9_1cZt!+72IT)+$X}z(Wo_IVqJ6E`0*?)VkrS?T~0kVCY zCwI@iel8&lDaW}~IGBo9Ly3q0X2oPSniQki;y0VDN|RNw7!`|EQBHjRdHo+jY#RQ>?t0_;V*+It>>YNVa`M2tjbd09e5dyI}^};Mvx* zrKQy=pI2mtrk3^#Q=M;fIgCpm?JYto;_lPpMYpLGDyDPQk{tFp?EdQap+J#4bJQ2d z%Ief_4p-@PlYxv@$rtj;cw+EJ(XXtmuIS3O6}O8T$E%mlg(rrcL3M-gow<-$UEa~4 zs5DXUkkb&^oMr04^kU{=?tazsy1kWyvD%)NYYXY|$D=c|g}asgH)oq`UnJ)s+qZUN z+wAM-V#1Jeo=Sy-sfaCi|1`t~!qML0 s|2OP=+F6u_jim{_(Mys3U@T%w$%DpoCi9+0nom;2!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuDPg-T`G9JYD@<);T3K0RXy7RptNy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_15.png new file mode 100644 index 0000000000000000000000000000000000000000..9627293d160659eb3b5484d32e5f114c874c3d02 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu6VidDuA*Kp00i_>zopr0J1|>O#lD@ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ea121f7a2c4a4f2702fec12a10098b779babf41c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuE_&io0eg>anP(#|R>*<6{p!oO{mq-245W@4fdzDCpJes&s(9 z)#p|vmoLSNWwO?p*F+>~54zf2@MOH~cYL{E&9LfiX8L9I7XikEPi==&wU8ZyU((8c zhGPnRje#=5yj?b~hXPU0;il2IqkjZ_bm*@@6wW{o?2^OafPkoh4btF-VG#r` zv_TkZpaZr+6?8!ZBtYDWzIZ(cK^TD)9D+^|4|1u!a1k0I4jvc;JNTd;Zh>El-n*2mD^QY4*d>DFG|fzHaeSRP?gPAK#rSHH6kLzO#oG9nZciwg-t5tJle^=t_5v@3_+> z(`z!G-I?BaCh1HJB_&~1ELO8cFtHr6g*rCJweZJ58exK)kz7KjmPQA8D3+UZ0 zyH9XWu}XKyS!djRR-ojXt=k66GrHeFjc`@M=WJ(b{opqtH6fR;8*Uwei7EIct%1&F`11f#b~zp%_ghTXjLpm#bQ;IjxRrN|09SF_eTcC q{x4{L*;5cfd2z!)YDTJ>Prp^m$xHeT^P4 zcDfxt$-7EXzD@Re^Ul+f%7*Mcc37P={0`~_YZ5+J2P^OPe-ls_a{GGV`XNY7!!IeN zzQQ#Hz6U_fz}{GP-Fr+L5Bj?O&MWPcA1D9FYWH@3ZZ^(?AEw|UoRj;|4Ba9KHi&@( z5~2w%I0arXK`*pI4V;BW2!R-s5n?wD9=HWj7=|+-HsoFXFbl^a2u>JuN;}lwbs5&EJJ2^ z``o_Vn-^ljlysg?4g`~7H53m^!m3!TW{YCB+Wc0Fsx+yJ&8*l|MLGH9=Z${|(b0j( s;Kct4N1yi=giu+UFc`TS9tlRnYElj~UTS%onUSA^PN&DQ(h<1*7h`0YlmGw# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_9.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_9.png new file mode 100644 index 0000000000000000000000000000000000000000..e1fdf8e3da5c08f3b314513078f4a33ed78c2db8 GIT binary patch literal 591 zcmZ{fPe{{o7{)(aO1dQ_k%={sXkp;uw>i!I$ZGOio2gURDubl0Ib+szZc8vKHN?pN zD0nduV;7MKX}hF$8JVZDLqUhIV^Q6-Lm)xDJ9g;sexL92zTfA0pYOd^ue-=lW&nyB zJep5%SFQ@S$ys69c}5`binG}X>2c%lV7_o&!so7M;obi4LdruPUo+e|1VbaRC9R=v za9x2P0Z^x4Z)|3{?U)Q6w>J4*S5FLn9Q-3}YsvJbrf35EFbo&ryu61RXc9xPLku)X zh$pz=G_-*kTEGEia1N><1QJkINZe8I!fl8`H=G5DA^+-tF*puEa6vCrg9i@7EHpyx z!_{_)rBC|2V$(mlRx3<*xzVjz);>AwgcQa+7bJ^ucdm3y&y-4Yph0u`OFx7HSsu(& zksZk^*S|ekVl++!Mh!|jlTO6qeLu5)Wn**0SYRl;pUu}+U%M8U%m;(|O5b~1Cce3T zpiU^Dx!D zeSBZ)%_|9EPP*EYoxx;S4aLI(*c7YHVpS|QyWeJ2m1>WD-#kE-p?{gi`$hMdi?ax0Z(coafxj@1DEwbXa7PRtW%^&1!Oy%7v<_qPI&^ z?zTwfI9+|@$~ul z01b@JQI9#5N+p0jpa+-)wg3mP2}FTKpc~i#CIDjTm|1|5i9G-Y0Sbx%%Rjr1v`xgj z9BvGiiy^_xk628KQt|7AOl{mcO&QWAp+q=NtEkywGZ{Rpg5RrR+1u-f-2F}d>Q1b9 zDnFNAl=9}r7InWxgvcohGqR7I0PyB1KH%enoPQ-q0v*%pG+L(7={-6v$9g%Y*DyWD z*l_uij{XBgV}WpJ?SG)}Vk}EQgOCskM}kYfXprOS1N|JktW#HL2%Fhq${4-dziKLK AzyJUM literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_1.png new file mode 100644 index 0000000000000000000000000000000000000000..9e0d084576c9da96a988ad38cea7a58bb03359d5 GIT binary patch literal 416 zcmZ{d-z!6L7{;H4VoQc;Ye{a1wECX4MJL5LbGF!UwnQ$R*$*bOwH@VGlH6z)D_7F~ zhT)ddEXkHuxN#@R!atyJ;XRiwT)gk|KF|ApdiN*1V!hU^1yJvH2@ckq5HKdPXOsQ3 z7?>FIJJabjFbfD20QbN)unFXVB)|b{z#>5SG>`%8z!Xpdj)CDgU0>XpiPI>O*N4H% zV?;IcqoQCqcq-B{>JqM*6rgKXOM|1ViNX%I;P9Isg0hL_Z?0|&rR(x#v8F|?RGwd7 zjCw;;Tc4;ws0oGd6TU|U6z8-O3MgSdm<*G^$~dcqV-~B;Z{>Jq=b6pIY&>HlmCvm| uKr9}LM%Moade6u61T?B2BGKjWN+1^I6&hfh<8E}_OSFXB=@oKA^6oDY_h|e8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_10.png new file mode 100644 index 0000000000000000000000000000000000000000..b871f471e5159d9632f231fc98b88f2324591cba GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H={ussI20 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_12.png new file mode 100644 index 0000000000000000000000000000000000000000..57a4cfc992921f038e57ed692799c0a500ef1e74 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H_O8mH+?% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_13.png new file mode 100644 index 0000000000000000000000000000000000000000..ed199a19924bc6a099127dbbecb2c06973614d96 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HIk_E&u=k literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_15.png new file mode 100644 index 0000000000000000000000000000000000000000..0aa3557510254138c2e116d4f5e409da3a852b96 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuc>n+a literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c154708ade98a61d6f2d87a92f8a57c721ec496c GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}x* z332W2?q=vUkjg99gyoH=yr*tvrz8ATsFdiLW^AdAYtxA9l29tQBK&FZdKuHEqS3j3^P645bDP46hOx7_4S6Fo+k-*%fF5l&}f# z332W2?yj$8m@rjp^n0S0?p23;+Njq4e*G8j7B7}Ql6vNIVh%^4i*7y|tn{CpT3 z?HQaM8JZgz@);O5WdHjIG>5Sy$S;_|;n|He5GTpo-9?yZcg!>(hqJ&VvY3H^TNs2H z8D`Cq01B#lx;TbNTux4qFgS4H$eBZ@j-5Mrl2!D21P?| zeoAIqC2kGoyZsLUH3))iNXyJg%}dNpwJHHJ7);`g)mS~;fRYTJu6{1-oD!M<_BL-x literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_4.png new file mode 100644 index 0000000000000000000000000000000000000000..afdf5d014184a88153065fe3c1cb9ed310101115 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuNl9fszcKu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fi>_1EhE19^dgf%yy!b*-s;fgGliAirP+hO)_LEr2}6ByV>Ymi~;Jfj|ytfk$L9 z0|U1(2s1Lwnj--e^zw9Z4B@yQ+IyR~!GMQZc1A;4(+p09-|yY#h^YK2R@df#&?`H4 z(nIeP(;RoH%oJVYar_wHx3mL!AJ5Fx+_`0H=#{ye*AD)u`}>6P>`Sh#B914jfTpUJ zxJHzuB$lLFB^RXvDF!10LnB>716?DN5FfAjpQa%$(G`#N1S?5+H-YG~Qs}x#H76Nd`|>KbLh*2~7YTE_$5+ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_1.png new file mode 100644 index 0000000000000000000000000000000000000000..9320aa9e09150f916c039f6fc36071b80093ce7d GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+Fi>_1EhE19|`d{|^id%x7S*m~8VF$Y&}E@(X5QD4TrN0?1=b@^*J&{gMCjIFQ3x z;1OBOz`!jG!i)^F=12eqLp@y_LpZL7_TJ`gP~dUxE@YGzd+>neEsM~%`6rpO9{qjk zSuC%#{?bMh$J5Lk92W8foZ$%2%5ybalcZpM_3q0_Q8sUQ{Q3B=dzil1tln?U{d@b@ zW@(8U?q@+AwG)9BsFt`!l%ynr>mdK II;Vst0OUA*{Qv*} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_10.png new file mode 100644 index 0000000000000000000000000000000000000000..82220654754d535fcf93adefab90c6b16ea0cfab GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U!NU{Q+CW(bPgg&ebxsLQ0IWz<)Bpeg literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_11.png new file mode 100644 index 0000000000000000000000000000000000000000..bd06d3081aab919a33e2709f8b6551ba26019641 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U;k5JIdx5eHp00i_>zopr0Ib|p^8f$< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_12.png new file mode 100644 index 0000000000000000000000000000000000000000..f1dc5bce77a77231f97e7e83a2f479668ca99b9a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U5&y9$cAzYSr>mdKI;Vst0G|p|{Qv*} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_13.png new file mode 100644 index 0000000000000000000000000000000000000000..59b0c5a5a7f3b7bd19853ee2e3c747acacf8f116 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UamB%`i9lHfPgg&ebxsLQ0Ifn)`~Uy| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_14.png new file mode 100644 index 0000000000000000000000000000000000000000..e83523427e787e6f80cde35752a4c4008b9fed43 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U$+M;ZjexQYp00i_>zopr0JY*(g#Z8m literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_15.png new file mode 100644 index 0000000000000000000000000000000000000000..885926b08cbe4f24591a21f97a9c06cde30df600 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu V>BL3nmjGoMJYD@<);T3K0RXe0Rd4_R literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_2.png new file mode 100644 index 0000000000000000000000000000000000000000..9a0c715745e96169a654cfcd28fb531040fdc037 GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fi>_1EhEGca5V3=GU?U~sxwei10eR1)MD%)n4K`K$$y$C%{p?!wZaaWfFe;Vkfo zEM{Qf76xHPhFNnYfP!A0E{-7_*F$@6^EMdpFw4$pC~KO*sqp)~+Z+*16f z)e_f;l9a@fRIB8oR3OD*WMF8dYiOWrWD;UzXk}n(WniLfU}9xp;P&i$4T^@`{FKbJ wO57UEcl#dzY7hk3kd~Q~nwOZHYE=ScFqp<01so814wPi@boFyt=akR{06Zmn?f?J) literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_3.png new file mode 100644 index 0000000000000000000000000000000000000000..049ca7fcf13d2b71cfcc606fc8b9fe7b0e597bf8 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+Fi>_1EhEGca8G|NnnrU|>E2LvnfYOrR`NNswPK14G&5vlc)eW0JSK3+s>km&bt| z&H|6fVg?3oVGw3ym^DWNC>ZML;uyklJ+${WZ-WAlYj+`|wAh0OEN@wazRf?$l=bNE zOV46?rS+FKnmC?j-r%s1C*TZ6fL5NX*_tE;>#KKPPKvU5!{g7#f8E3M#b)(>Ywq9M zzcx!t)Nnrw>ZqLvv_Q4QHKHUXu_V!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu%^TPZ@#qY!h@yd`H^f9-*qGGw;FFF}NC$hFUb1*kPy0Rz!X?DE1aHYkE zT`{V5`Zfh7pFX^=?LGhgZn4vhN9*1`E_OWoadTxMJv;WHu&r+7oqgi-$JH*6vUtSy zykY*uPr=k%ffH6w!b<7M!ITJ^>e8Gp)v38-noCz3b=B=u-MXqC{jzrTpFn1yC*6DL p|AGClB5x$Hr9|jW_opr-GAZ4X4^46P^{u7bGQ45bDP46hOx7_4S6Fo+k-*%fF5lqd@D z331J~ufJCRe*yzTBLhP?1A`e*F9SmX14A(bgF6F5AOnLc1A{*UgBJsXB?E&L1A{Tp z=HtgJC-!eSu)ks2v^EBY!?$mDFPN9hz!1v70JH+==2!*>paX$cbTKg4F)$=DFyu2Z zcrY-SGB9{EFl<=jp9Hj>sU*k`=$*33XDxs{#w2fd7p2(Lm^DBSXMsl~(0*=V5N2eU zHAey{813oe7$R|b>baYI4hAAD7x=msZOK|$`~QFZmuGG&hivAhs2#qcyyLmDMZv>H z;U63VP6954N|ye{w*supS*MFnS#@da#*oZg>*SARF6%ndBr4r_fUo=U@yp>BjCWj^ zKX6z4p9-`_wZt`|BqgyV)hf9t6-Y4{85kPr8XD*tnS>Y_S{ayH8JOrAm{=JYxIOz` zgQ6ifKP5A*61N8P-TnuF8U#T$q-Ex$<|XE)T9p793}*3$r~Ci103{hbUHx3vIVCg! E0Gq~=T>t<8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_6_10.png new file mode 100644 index 0000000000000000000000000000000000000000..d5b78f5a5e0e7e9e3504e9a95e4c762cf3046a23 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IAVbyZ`_I literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_6_12.png new file mode 100644 index 0000000000000000000000000000000000000000..cd9f268f1d2f84d7123c3a6bbcb1cab8ea039123 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IUO4>i_@% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_6_14.png new file mode 100644 index 0000000000000000000000000000000000000000..8eef961ddeb3c94aded1fcff32ebcf15ac953ae3 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu45bDP46hOx7_4S6Fo+k-*%fF5lqe1G z331J~ufJCRe*yzTBLhP?1A`e*F9SmX14A(bgF6F5AOnLc1A{*UgBJsXB?E&L1A{Tp z(2LH$&H|B38<73V@z({1U#Dz-op#J+UPj7#I>681fky zJQx^E85q177<78qx&a-)R1)L|^ikR5vlc)eW0JSKi?UWyjunu@S>O=~bON_92s1Lw znj--ejPi7G43W4z_1sN92Lln73w&LRLe_45|NnpIy*nK)GmcL_lOj>g^1X(I+f1f_ zNnEamqe-Dh<$0l#wAR&`&ptK9h^B^0uQJKK&i~jX*fr^3SFb}t`@xToUuw^J@{ffz zZi`q4&=%Da*NBpo#FA9245bDP46hOx7_4S6Fo+k-*%fF5l*kG2 z331J~ufJCRe*yzTBLhP?1A`e*F9SmX14A(bgF6F5AOnLc1A{*UgBJsXB?E&L1A{RG zL+Y}tss-~sdiTnuPHSUe$Yo#%Wncgr4s>lS0|U@$K*PHj80;7r5*Zls85lem7)%)$ zycrnI2t+dh?PV$n@&kILZ1PzPAdfN0+ucQBbGB^*ki%Kv5ec-JTNs2H8D`Cq018HW zx;TbNT%LOFG@pZk2+IXNy{;hFz4!nB?_YDL!)3-(&om<^o2F{JCT4NDj)U$E0+STG zgk7hk?O9kHJY|XAiY=B$ic)w9Yqq|M-Utr++e^WYw((1{Q;A ziEBhjN@7W>RdP`(kYX@0Ff`ING|)9N2{AIXGBC9=Fwr$Iu`)1ld-lBsMMG|WN@iLm vZVl$U{SN>&2!d=#%gjm5OUzBRDgiPW%;Jqz8|P>MB^f+j{an^LB{Ts5vm%Ad literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_6_4.png new file mode 100644 index 0000000000000000000000000000000000000000..fe903b7cdc750bdbfa97b2dda33c6b4c05e2173e GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;161o9C zA+Fi>_1EhE>zv&vU7gM2ZpUe?BM=wJuBpszYsw-e#_eEkGP8r**NHF4EuVowfAZOt zK#fc#L4Lsu3}utgS^#;BN#5=*eEE9~{DB)l@5X9OmS3O5?K zEab5Xa{&4(fN#e4LT^wYsFt`!l%ynmdKI;Vst0L)o(UH||9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_6_5.png new file mode 100644 index 0000000000000000000000000000000000000000..b6bd4743e40270a8e3e785589c97c7b68b3454cf GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J5l6W&i*H literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_7_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_7_11.png new file mode 100644 index 0000000000000000000000000000000000000000..5808748a3a3ef3109ff0abd256ba44e1c43d4249 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J7>;TL1t6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_7_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_7_13.png new file mode 100644 index 0000000000000000000000000000000000000000..51ff95e8c2204ba64e84f6f5f33f407f9961908e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0I+yfAOHXW literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_7_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_7_14.png new file mode 100644 index 0000000000000000000000000000000000000000..807bd75f3e70878dd2d42369656f36aaad776c3f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0I=y*RsaA1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_11.png new file mode 100644 index 0000000000000000000000000000000000000000..6191dbe9a18b406d3c7704c1518411015e7c4688 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J(=%&j0`b literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_13.png new file mode 100644 index 0000000000000000000000000000000000000000..bdfeda8cc0bb8cd0ea463c6441a813169287835e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuR literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_15.png new file mode 100644 index 0000000000000000000000000000000000000000..c13d8864aeb7f86166ea74e874e63e85fa556751 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H*g;hyVZp literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_2.png new file mode 100644 index 0000000000000000000000000000000000000000..579bcc9b388088590b9ffd9467474d7bd9c9a808 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Tj!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu@~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_11.png new file mode 100644 index 0000000000000000000000000000000000000000..da7ce8cd31fe402fa63f923eb5195a88335d0440 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLupuk}8boFyt=akR{0H(-PcmMzZ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_12.png new file mode 100644 index 0000000000000000000000000000000000000000..968a8ef3158d4fa6f79208788a794c7844458896 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H4lO6951J literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_14.png new file mode 100644 index 0000000000000000000000000000000000000000..7507d39f0ad6d68fa5262f41b658d38a099f6ebd GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0I8}}wg3PC literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_15.png new file mode 100644 index 0000000000000000000000000000000000000000..820d3c7e70989a6dad484dc302ec60b7cacdef19 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuFtsN8K5kKr>mdKI;Vst0I9@OsQ>@~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ee576343e24597fe94157b4495547beed83cf6be GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu> 4; - int textureJ = filler.currentPattern.getTextureIndex() - textureI * 16; - - drawTexturedModalRect(guiLeft + patternSymbolX, guiTop + patternSymbolY, 16 * textureJ, 16 * textureI, 16, 16); + func_94065_a(guiLeft + patternSymbolX, guiTop + patternSymbolY, filler.currentPattern.getTexture(), 16, 16); } } diff --git a/common/buildcraft/builders/gui/GuiTemplate.java b/common/buildcraft/builders/gui/GuiTemplate.java index 51cfd97d..de7c77f7 100644 --- a/common/buildcraft/builders/gui/GuiTemplate.java +++ b/common/buildcraft/builders/gui/GuiTemplate.java @@ -54,9 +54,8 @@ public class GuiTemplate extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/template_gui.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/template_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index f788e179..1306e99d 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -2,14 +2,18 @@ package buildcraft.core; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.World; public class BlockSpring extends Block { public BlockSpring(int id) { - super(id, 17, Material.rock); + super(id, Material.rock); setBlockUnbreakable(); setResistance(6000000.0F); setStepSound(soundStoneFootstep); @@ -22,17 +26,24 @@ public class BlockSpring extends Block { public void updateTick(World world, int x, int y, int z, Random random) { assertSpring(world, x, y, z); } - + @Override public void onNeighborBlockChange(World world, int x, int y, int z, int blockid) { assertSpring(world, x, y, z); } - + private void assertSpring(World world, int x, int y, int z) { - + if(!world.isAirBlock(x, y + 1, z)) return; - - world.setBlockWithNotify(x, y + 1, z, Block.waterStill.blockID); + + world.func_94575_c(x, y + 1, z, Block.waterStill.blockID); + } + + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + field_94336_cN = par1IconRegister.func_94245_a("water"); } } diff --git a/common/buildcraft/core/BuildCraftConfiguration.java b/common/buildcraft/core/BuildCraftConfiguration.java index 2db5dfc6..af53ef39 100644 --- a/common/buildcraft/core/BuildCraftConfiguration.java +++ b/common/buildcraft/core/BuildCraftConfiguration.java @@ -22,18 +22,8 @@ public class BuildCraftConfiguration extends Configuration { @Override public void save() { - Property versionProp = null; - - if (!categories.get(CATEGORY_GENERAL).containsKey("version")) { - versionProp = new Property(); - versionProp.setName("version"); - categories.get(CATEGORY_GENERAL).put("version", versionProp); - } else { - versionProp = categories.get(CATEGORY_GENERAL).get("version"); - } - - versionProp.value = Version.VERSION; - + Property versionProp = get(CATEGORY_GENERAL, "version", Version.VERSION); + versionProp.set(Version.VERSION); super.save(); } diff --git a/common/buildcraft/core/EntityBlock.java b/common/buildcraft/core/EntityBlock.java index 9780cc09..118ea6d0 100644 --- a/common/buildcraft/core/EntityBlock.java +++ b/common/buildcraft/core/EntityBlock.java @@ -9,13 +9,17 @@ package buildcraft.core; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Icon; import net.minecraft.world.World; public class EntityBlock extends Entity { - public int texture = -1; + @SideOnly(Side.CLIENT) + public Icon texture = null; public float shadowSize = 0; public float rotationX = 0; @@ -47,9 +51,9 @@ public class EntityBlock extends Entity { this.motionZ = 0.0; } - public EntityBlock(World world, double i, double j, double k, double iSize, double jSize, double kSize, int textureID) { + public EntityBlock(World world, double i, double j, double k, double iSize, double jSize, double kSize, Icon texture) { this(world, i, j, k, iSize, jSize, kSize); - texture = textureID; + this.texture = texture; } @Override diff --git a/common/buildcraft/core/EntityRobot.java b/common/buildcraft/core/EntityRobot.java index 855e01c2..a3e562c0 100644 --- a/common/buildcraft/core/EntityRobot.java +++ b/common/buildcraft/core/EntityRobot.java @@ -214,12 +214,12 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData { if (target.mode == Mode.ClearIfInvalid) { if (!target.isValid(a.context)) { - worldObj.setBlockAndMetadataWithNotify(target.x, target.y, target.z, 0, 0); + worldObj.setBlockAndMetadataWithNotify(target.x, target.y, target.z, 0, 0,1); } } else if (target.stackToUse != null) { - worldObj.setBlockWithNotify(target.x, target.y, target.z, 0); + worldObj.func_94575_c(target.x, target.y, target.z, 0); throw new RuntimeErrorException(null, "NOT IMPLEMENTED"); // target.stackToUse.getItem().onItemUse(target.stackToUse, // CoreProxy.getBuildCraftPlayer(worldObj), worldObj, target.x, target.y - 1, diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index 41577c12..2bf554ec 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -12,6 +12,7 @@ package buildcraft.core; import java.util.HashMap; import java.util.Map; +import net.minecraft.item.ItemStack; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; import buildcraft.api.power.IPowerReceptor; @@ -113,4 +114,15 @@ public abstract class TileBuildCraft extends TileEntity implements ISynchronized } + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/core/Version.java b/common/buildcraft/core/Version.java index d1e439d3..2564f82f 100644 --- a/common/buildcraft/core/Version.java +++ b/common/buildcraft/core/Version.java @@ -11,7 +11,7 @@ import buildcraft.BuildCraftCore; import buildcraft.core.proxy.CoreProxy; public class Version implements Runnable { - + private static Version instance = new Version(); public enum EnumUpdateState { @@ -46,12 +46,12 @@ public class Version implements Runnable { Property property = BuildCraftCore.mainConfiguration.get("vars", "version.seen", VERSION); property.comment = "indicates the last version the user has been informed about and will suppress further notices on it."; - String seenVersion = property.value; + String seenVersion = property.getString(); if (recommendedVersion == null || recommendedVersion.equals(seenVersion)) return false; - property.value = recommendedVersion; + property.set(recommendedVersion); BuildCraftCore.mainConfiguration.save(); return true; } @@ -158,14 +158,14 @@ public class Version implements Runnable { int count = 0; currentVersion = null; - + BuildCraftCore.bcLog.info("Beginning version check"); - + try { while ((count < 3) && ((currentVersion == null) || (currentVersion == EnumUpdateState.CONNECTION_ERROR))) { versionCheck(); count++; - + if (currentVersion == EnumUpdateState.CONNECTION_ERROR) { BuildCraftCore.bcLog.info("Version check attempt " + count + " failed, trying again in 10 seconds"); Thread.sleep(10000); @@ -175,15 +175,15 @@ public class Version implements Runnable { catch (InterruptedException e) { e.printStackTrace(); } - + if (currentVersion == EnumUpdateState.CONNECTION_ERROR) { BuildCraftCore.bcLog.info("Version check failed"); } - + } - + public static void check() { - + new Thread(instance).start(); } diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index d512b838..7bcea412 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -4,6 +4,7 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import org.lwjgl.opengl.GL11; @@ -25,12 +26,8 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { return ""; } - public String getTexture() { - return ""; - } - - public int getTextureIndex() { - return 0; + public Icon getTexture() { + return null; } public ItemStack getItemStack() { @@ -47,14 +44,8 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { if (getItemStack() != null) { drawStack(getItemStack()); - } else if (getTexture() != null && !getTexture().equals("")) { - int texture = mc.renderEngine.getTexture(getTexture()); - mc.renderEngine.bindTexture(texture); - - int textureI = getTextureIndex() >> 4; - int textureJ = getTextureIndex() - textureI * 16; - - drawTexturedModalRect(cornerX + x, cornerY + y, 16 * textureJ, 16 * textureI, 16, 16); + } else if (getTexture() != null) { + func_94065_a(cornerX + x, cornerY + y, getTexture(), 16, 16); } } diff --git a/common/buildcraft/core/gui/GuiBuildCraft.java b/common/buildcraft/core/gui/GuiBuildCraft.java index ee7f4190..66b8096f 100644 --- a/common/buildcraft/core/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/gui/GuiBuildCraft.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import org.lwjgl.opengl.GL11; @@ -34,7 +35,7 @@ public abstract class GuiBuildCraft extends GuiContainer { /** * Inserts a ledger into the next-to-last position. - * + * * @param ledger */ public void insert(Ledger ledger) { @@ -197,7 +198,6 @@ public abstract class GuiBuildCraft extends GuiContainer { } protected void drawBackground(int x, int y) { - int texture = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/ledger.png"); float colorR = (overlayColor >> 16 & 255) / 255.0F; float colorG = (overlayColor >> 8 & 255) / 255.0F; @@ -205,7 +205,7 @@ public abstract class GuiBuildCraft extends GuiContainer { GL11.glColor4f(colorR, colorG, colorB, 1.0F); - mc.renderEngine.bindTexture(texture); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/ledger.png"); drawTexturedModalRect(x, y, 0, 256 - currentHeight, 4, currentHeight); drawTexturedModalRect(x + 4, y, 256 - currentWidth + 4, 0, currentWidth - 4, 4); // Add in top left corner again @@ -216,15 +216,10 @@ public abstract class GuiBuildCraft extends GuiContainer { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); } - protected void drawIcon(String texture, int iconIndex, int x, int y) { + protected void drawIcon(Icon icon, int x, int y) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); - int tex = mc.renderEngine.getTexture(texture); - mc.renderEngine.bindTexture(tex); - int textureRow = iconIndex >> 4; - int textureColumn = iconIndex - 16 * textureRow; - drawTexturedModalRect(x, y, 16 * textureColumn, 16 * textureRow, 16, 16); - + func_94065_a(x, y, icon, 16, 16); } } diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 832137a1..567246c7 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -15,6 +15,8 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -116,8 +118,11 @@ public class CoreProxyClient extends CoreProxy { RenderingRegistry.registerBlockHandler(new RenderingOil()); RenderingRegistry.registerBlockHandler(new RenderingMarkers()); - MinecraftForgeClient.preloadTexture(DefaultProps.TEXTURE_BLOCKS); - MinecraftForgeClient.preloadTexture(DefaultProps.TEXTURE_ITEMS); + TextureMap blockTextureMap = Minecraft.getMinecraft().renderEngine.field_94154_l; + BuildCraftCore.redLaserTexture = blockTextureMap.func_94245_a("buildcraft:blockRedLaser"); + BuildCraftCore.blueLaserTexture = blockTextureMap.func_94245_a("buildcraft:blockBlueLaser"); + BuildCraftCore.stripesLaserTexture = blockTextureMap.func_94245_a("buildcraft:blockStripesLaser"); + BuildCraftCore.transparentTexture = blockTextureMap.func_94245_a("buildcraft:blockTransparentLaser"); } @Override @@ -131,7 +136,7 @@ public class CoreProxyClient extends CoreProxy { /* NETWORKING */ @Override public void sendToServer(Packet packet) { - FMLClientHandler.instance().getClient().getSendQueue().addToSendQueue(packet); + FMLClientHandler.instance().getClient().getNetHandler().addToSendQueue(packet); } /* FILE SYSTEM */ diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/render/RenderEntityBlock.java index ddba60bb..600f8ca0 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/render/RenderEntityBlock.java @@ -10,9 +10,11 @@ package buildcraft.core.render; import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.ForgeHooksClient; @@ -24,6 +26,7 @@ import buildcraft.core.EntityBlock; public class RenderEntityBlock extends Render { + private static RenderBlocks renderBlocks = new RenderBlocks(); public static class BlockInterface { public double minX; @@ -35,10 +38,10 @@ public class RenderEntityBlock extends Render { public Block baseBlock = Block.sand; - public int texture = -1; + public Icon texture = null; - public int getBlockTextureFromSide(int i) { - if (texture == -1) + public Icon getBlockTextureFromSide(int i) { + if (texture == null) return baseBlock.getBlockTextureFromSide(i); else return texture; @@ -89,8 +92,6 @@ public class RenderEntityBlock extends Render { GL11.glRotatef(entity.rotationZ, 0, 0, 1); GL11.glTranslatef(iBase, jBase, kBase); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_BLOCKS, 0); - int lightX, lightY, lightZ; lightX = (int) (Math.floor(entity.posX) + iBase); @@ -130,7 +131,7 @@ public class RenderEntityBlock extends Render { tessellator.setColorOpaque_F(f * f5, f * f5, f * f5); } - renderBottomFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(0)); + renderBlocks.renderBottomFace(null, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(0)); if (doLight) { f5 = block.getBlockBrightness(blockAccess, i, j, k); @@ -140,7 +141,7 @@ public class RenderEntityBlock extends Render { tessellator.setColorOpaque_F(f1 * f5, f1 * f5, f1 * f5); } - renderTopFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(1)); + renderBlocks.renderTopFace(null, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(1)); if (doLight) { f5 = block.getBlockBrightness(blockAccess, i, j, k); @@ -150,7 +151,7 @@ public class RenderEntityBlock extends Render { tessellator.setColorOpaque_F(f2 * f5, f2 * f5, f2 * f5); } - renderEastFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(2)); + renderBlocks.renderEastFace(null, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(2)); if (doLight) { f5 = block.getBlockBrightness(blockAccess, i, j, k); @@ -160,7 +161,7 @@ public class RenderEntityBlock extends Render { tessellator.setColorOpaque_F(f2 * f5, f2 * f5, f2 * f5); } - renderWestFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(3)); + renderBlocks.renderWestFace(null, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(3)); if (doLight) { f5 = block.getBlockBrightness(blockAccess, i, j, k); @@ -170,7 +171,7 @@ public class RenderEntityBlock extends Render { tessellator.setColorOpaque_F(f3 * f5, f3 * f5, f3 * f5); } - renderNorthFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(4)); + renderBlocks.renderNorthFace(null, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(4)); if (doLight) { f5 = block.getBlockBrightness(blockAccess, i, j, k); @@ -180,189 +181,10 @@ public class RenderEntityBlock extends Render { tessellator.setColorOpaque_F(f3 * f5, f3 * f5, f3 * f5); } - renderSouthFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(5)); + renderBlocks.renderSouthFace(null, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(5)); if (doTessellating) { tessellator.draw(); } } - - public static void renderBottomFace(BlockInterface block, double d, double d1, double d2, int i) { - Tessellator tessellator = Tessellator.instance; - - int j = (i & 0xf) << 4; - int k = i & 0xf0; - double d3 = (j + block.minX * 16D) / 256D; - double d4 = ((j + block.maxX * 16D) - 0.01D) / 256D; - double d5 = (k + block.minZ * 16D) / 256D; - double d6 = ((k + block.maxZ * 16D) - 0.01D) / 256D; - if (block.minX < 0.0D || block.maxX > 1.0D) { - d3 = (j + 0.0F) / 256F; - d4 = (j + 15.99F) / 256F; - } - if (block.minZ < 0.0D || block.maxZ > 1.0D) { - d5 = (k + 0.0F) / 256F; - d6 = (k + 15.99F) / 256F; - } - double d7 = d + block.minX; - double d8 = d + block.maxX; - double d9 = d1 + block.minY; - double d10 = d2 + block.minZ; - double d11 = d2 + block.maxZ; - - tessellator.addVertexWithUV(d7, d9, d11, d3, d6); - tessellator.addVertexWithUV(d7, d9, d10, d3, d5); - tessellator.addVertexWithUV(d8, d9, d10, d4, d5); - tessellator.addVertexWithUV(d8, d9, d11, d4, d6); - } - - public static void renderTopFace(BlockInterface block, double d, double d1, double d2, int i) { - Tessellator tessellator = Tessellator.instance; - - int j = (i & 0xf) << 4; - int k = i & 0xf0; - double d3 = (j + block.minX * 16D) / 256D; - double d4 = ((j + block.maxX * 16D) - 0.01D) / 256D; - double d5 = (k + block.minZ * 16D) / 256D; - double d6 = ((k + block.maxZ * 16D) - 0.01D) / 256D; - if (block.minX < 0.0D || block.maxX > 1.0D) { - d3 = (j + 0.0F) / 256F; - d4 = (j + 15.99F) / 256F; - } - if (block.minZ < 0.0D || block.maxZ > 1.0D) { - d5 = (k + 0.0F) / 256F; - d6 = (k + 15.99F) / 256F; - } - double d7 = d + block.minX; - double d8 = d + block.maxX; - double d9 = d1 + block.maxY; - double d10 = d2 + block.minZ; - double d11 = d2 + block.maxZ; - - tessellator.addVertexWithUV(d8, d9, d11, d4, d6); - tessellator.addVertexWithUV(d8, d9, d10, d4, d5); - tessellator.addVertexWithUV(d7, d9, d10, d3, d5); - tessellator.addVertexWithUV(d7, d9, d11, d3, d6); - } - - public static void renderEastFace(BlockInterface block, double d, double d1, double d2, int i) { - Tessellator tessellator = Tessellator.instance; - - int j = (i & 0xf) << 4; - int k = i & 0xf0; - double d3 = (j + block.minX * 16D) / 256D; - double d4 = ((j + block.maxX * 16D) - 0.01D) / 256D; - double d5 = (k + block.minY * 16D) / 256D; - double d6 = ((k + block.maxY * 16D) - 0.01D) / 256D; - - if (block.minX < 0.0D || block.maxX > 1.0D) { - d3 = (j + 0.0F) / 256F; - d4 = (j + 15.99F) / 256F; - } - if (block.minY < 0.0D || block.maxY > 1.0D) { - d5 = (k + 0.0F) / 256F; - d6 = (k + 15.99F) / 256F; - } - double d8 = d + block.minX; - double d9 = d + block.maxX; - double d10 = d1 + block.minY; - double d11 = d1 + block.maxY; - double d12 = d2 + block.minZ; - - tessellator.addVertexWithUV(d8, d11, d12, d4, d5); - tessellator.addVertexWithUV(d9, d11, d12, d3, d5); - tessellator.addVertexWithUV(d9, d10, d12, d3, d6); - tessellator.addVertexWithUV(d8, d10, d12, d4, d6); - } - - public static void renderWestFace(BlockInterface block, double d, double d1, double d2, int i) { - Tessellator tessellator = Tessellator.instance; - - int j = (i & 0xf) << 4; - int k = i & 0xf0; - double d3 = (j + block.minX * 16D) / 256D; - double d4 = ((j + block.maxX * 16D) - 0.01D) / 256D; - double d5 = (k + block.minY * 16D) / 256D; - double d6 = ((k + block.maxY * 16D) - 0.01D) / 256D; - - if (block.minX < 0.0D || block.maxX > 1.0D) { - d3 = (j + 0.0F) / 256F; - d4 = (j + 15.99F) / 256F; - } - if (block.minY < 0.0D || block.maxY > 1.0D) { - d5 = (k + 0.0F) / 256F; - d6 = (k + 15.99F) / 256F; - } - double d8 = d + block.minX; - double d9 = d + block.maxX; - double d10 = d1 + block.minY; - double d11 = d1 + block.maxY; - double d12 = d2 + block.maxZ; - - tessellator.addVertexWithUV(d8, d11, d12, d3, d5); - tessellator.addVertexWithUV(d8, d10, d12, d3, d6); - tessellator.addVertexWithUV(d9, d10, d12, d4, d6); - tessellator.addVertexWithUV(d9, d11, d12, d4, d5); - } - - public static void renderNorthFace(BlockInterface block, double d, double d1, double d2, int i) { - Tessellator tessellator = Tessellator.instance; - - int j = (i & 0xf) << 4; - int k = i & 0xf0; - double d3 = (j + block.minZ * 16D) / 256D; - double d4 = ((j + block.maxZ * 16D) - 0.01D) / 256D; - double d5 = (k + block.minY * 16D) / 256D; - double d6 = ((k + block.maxY * 16D) - 0.01D) / 256D; - - if (block.minZ < 0.0D || block.maxZ > 1.0D) { - d3 = (j + 0.0F) / 256F; - d4 = (j + 15.99F) / 256F; - } - if (block.minY < 0.0D || block.maxY > 1.0D) { - d5 = (k + 0.0F) / 256F; - d6 = (k + 15.99F) / 256F; - } - double d8 = d + block.minX; - double d9 = d1 + block.minY; - double d10 = d1 + block.maxY; - double d11 = d2 + block.minZ; - double d12 = d2 + block.maxZ; - - tessellator.addVertexWithUV(d8, d10, d12, d4, d5); - tessellator.addVertexWithUV(d8, d10, d11, d3, d5); - tessellator.addVertexWithUV(d8, d9, d11, d3, d6); - tessellator.addVertexWithUV(d8, d9, d12, d4, d6); - } - - public static void renderSouthFace(BlockInterface block, double d, double d1, double d2, int i) { - Tessellator tessellator = Tessellator.instance; - - int j = (i & 0xf) << 4; - int k = i & 0xf0; - double d3 = (j + block.minZ * 16D) / 256D; - double d4 = ((j + block.maxZ * 16D) - 0.01D) / 256D; - double d5 = (k + block.minY * 16D) / 256D; - double d6 = ((k + block.maxY * 16D) - 0.01D) / 256D; - - if (block.minZ < 0.0D || block.maxZ > 1.0D) { - d3 = (j + 0.0F) / 256F; - d4 = (j + 15.99F) / 256F; - } - if (block.minY < 0.0D || block.maxY > 1.0D) { - d5 = (k + 0.0F) / 256F; - d6 = (k + 15.99F) / 256F; - } - double d8 = d + block.maxX; - double d9 = d1 + block.minY; - double d10 = d1 + block.maxY; - double d11 = d2 + block.minZ; - double d12 = d2 + block.maxZ; - - tessellator.addVertexWithUV(d8, d9, d12, d3, d6); - tessellator.addVertexWithUV(d8, d9, d11, d4, d6); - tessellator.addVertexWithUV(d8, d10, d11, d4, d5); - tessellator.addVertexWithUV(d8, d10, d12, d3, d5); - } - } diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index 22785691..f5cc8815 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -47,7 +47,7 @@ public class RenderLaser extends Render { GL11.glRotatef((float) laser.angleZ, 0, 1, 0); GL11.glRotatef((float) laser.angleY, 0, 0, 1); - ForgeHooksClient.bindTexture(laser.getTexture(), 0); + renderManager.renderEngine.func_98187_b(laser.getTexture()); float factor = (float) (1.0 / 16.0); diff --git a/common/buildcraft/core/render/RenderRobot.java b/common/buildcraft/core/render/RenderRobot.java index 8450d162..f2887a12 100644 --- a/common/buildcraft/core/render/RenderRobot.java +++ b/common/buildcraft/core/render/RenderRobot.java @@ -36,7 +36,7 @@ public class RenderRobot extends Render { GL11.glDisable(2896 /* GL_LIGHTING */); GL11.glTranslated(x, y, z); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_PATH_ENTITIES + "/robot.png", 0); + renderManager.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_ENTITIES + "/robot.png"); float factor = (float) (1.0 / 16.0); diff --git a/common/buildcraft/core/render/RenderingMarkers.java b/common/buildcraft/core/render/RenderingMarkers.java index 9398013e..1a316a35 100644 --- a/common/buildcraft/core/render/RenderingMarkers.java +++ b/common/buildcraft/core/render/RenderingMarkers.java @@ -3,6 +3,7 @@ package buildcraft.core.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import buildcraft.BuildCraftCore; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -116,11 +117,11 @@ public class RenderingMarkers implements ISimpleBlockRenderingHandler { int yCoord = (int) y; int zCoord = (int) z; - int i = block.getBlockTexture(iblockaccess, xCoord, yCoord, zCoord, 1); + Icon i = block.getBlockTexture(iblockaccess, xCoord, yCoord, zCoord, 1); int m = meta; - int j = (i & 0xf) << 4; - int k = i & 0xf0; + int j = i.func_94211_a(); + int k = i.func_94216_b(); float f = j / 256F; float f1 = (j + 15.99F) / 256F; float f2 = k / 256F; @@ -170,8 +171,8 @@ public class RenderingMarkers implements ISimpleBlockRenderingHandler { i = block.getBlockTexture(iblockaccess, xCoord, yCoord, zCoord, 0); - j = (i & 0xf) << 4; - k = i & 0xf0; + j = i.func_94211_a(); + k = i.func_94216_b(); f = j / 256F; f1 = (j + 15.99F) / 256F; f2 = k / 256F; diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index 41b9928d..a877e4c8 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -134,7 +134,7 @@ public class TriggerInventory extends Trigger implements ITriggerDirectional { } @Override - public String getTextureFile() { + public String getTexture() { return DefaultProps.TEXTURE_TRIGGERS; } } diff --git a/common/buildcraft/core/triggers/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java index 757ccba0..f46e5f4f 100644 --- a/common/buildcraft/core/triggers/TriggerLiquidContainer.java +++ b/common/buildcraft/core/triggers/TriggerLiquidContainer.java @@ -137,7 +137,7 @@ public class TriggerLiquidContainer extends Trigger { } @Override - public String getTextureFile() { + public String getTexture() { return DefaultProps.TEXTURE_TRIGGERS; } } diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 4ef00b6a..2cdc1c74 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -56,7 +56,7 @@ public class TriggerMachine extends Trigger { } @Override - public String getTextureFile() { + public String getTexture() { return DefaultProps.TEXTURE_TRIGGERS; } } diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java index 88312ad8..e4b286d8 100644 --- a/common/buildcraft/core/utils/BlockUtil.java +++ b/common/buildcraft/core/utils/BlockUtil.java @@ -61,7 +61,7 @@ public class BlockUtil { } } - world.setBlockWithNotify(x, y, z, 0); + world.func_94575_c(x, y, z, 0); } public static boolean canChangeBlock(World world, int x, int y, int z) { diff --git a/common/buildcraft/core/utils/SidedInventoryAdapter.java b/common/buildcraft/core/utils/SidedInventoryAdapter.java index 8249d3d3..a8f63a88 100644 --- a/common/buildcraft/core/utils/SidedInventoryAdapter.java +++ b/common/buildcraft/core/utils/SidedInventoryAdapter.java @@ -8,9 +8,9 @@ import net.minecraftforge.common.ISidedInventory; /** * This class is responsible for abstracting an ISidedInventory as a normal IInventory - * + * * @author Krapht - * + * */ public class SidedInventoryAdapter implements IInventory { @@ -78,4 +78,18 @@ public class SidedInventoryAdapter implements IInventory { public ItemStack getStackInSlotOnClosing(int slot) { return _sidedInventory.getStackInSlotOnClosing(slot + _slotOffset); } + + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/core/utils/SimpleInventory.java b/common/buildcraft/core/utils/SimpleInventory.java index c22a6b94..0aedddb4 100644 --- a/common/buildcraft/core/utils/SimpleInventory.java +++ b/common/buildcraft/core/utils/SimpleInventory.java @@ -137,4 +137,18 @@ public class SimpleInventory implements IInventory, INBTTagable { { return _contents; } + + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/core/utils/SurroundingInventory.java b/common/buildcraft/core/utils/SurroundingInventory.java index 32704eb3..9e5c330a 100644 --- a/common/buildcraft/core/utils/SurroundingInventory.java +++ b/common/buildcraft/core/utils/SurroundingInventory.java @@ -175,4 +175,18 @@ public class SurroundingInventory implements IInventory, IBuilderInventory { return false; } + + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/core/utils/Utils.java b/common/buildcraft/core/utils/Utils.java index c0594f6d..54eab2cb 100644 --- a/common/buildcraft/core/utils/Utils.java +++ b/common/buildcraft/core/utils/Utils.java @@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; @@ -55,7 +56,7 @@ public class Utils { /** * Tries to add the passed stack to any valid inventories around the given coordinates. - * + * * @param stack * @param world * @param x @@ -219,7 +220,7 @@ public class Utils { /** * Ensures that the given inventory is the full inventory, i.e. takes double chests into account. - * + * * @param inv * @return Modified inventory if double chest, unmodified otherwise. */ @@ -315,7 +316,7 @@ public class Utils { jSize = 0.10; } - int texture = BuildCraftCore.redLaserTexture; + Icon texture = BuildCraftCore.redLaserTexture; switch (kind) { case Blue: diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index c47f9350..41ed5af2 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -45,7 +45,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { private void updateFlow(World world, int i, int j, int k) { int l = world.getBlockMetadata(i, j, k); - world.setBlockAndMetadata(i, j, k, blockID + 1, l); + world.setBlockAndMetadataWithNotify(i, j, k, blockID + 1, l, 1); world.markBlockRangeForRenderUpdate(i, j, k, i, j, k); world.markBlockForUpdate(i, j, k); } @@ -77,9 +77,9 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { if (j1 != l) { l = j1; if (l < 0) { - world.setBlockWithNotify(i, j, k, 0); + world.func_94575_c(i, j, k, 0); } else { - world.setBlockMetadataWithNotify(i, j, k, l); + world.setBlockMetadataWithNotify(i, j, k, l,1); world.scheduleBlockUpdate(i, j, k, blockID, tickRate(world)); world.notifyBlocksOfNeighborChange(i, j, k, blockID); } @@ -91,9 +91,9 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { } if (liquidCanDisplaceBlock(world, i, j - 1, k)) { if (l >= 8) { - world.setBlockAndMetadataWithNotify(i, j - 1, k, blockID, l); + world.setBlockAndMetadataWithNotify(i, j - 1, k, blockID, l,1); } else { - world.setBlockAndMetadataWithNotify(i, j - 1, k, blockID, l + 8); + world.setBlockAndMetadataWithNotify(i, j - 1, k, blockID, l + 8,1); } } else if (l >= 0 && (l == 0 || blockBlocksFlow(world, i, j - 1, k))) { boolean aflag[] = getOptimalFlowDirections(world, i, j, k); @@ -124,7 +124,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { if (i1 > 0) { Block.blocksList[i1].dropBlockAsItem(world, i, j, k, world.getBlockMetadata(i, j, k), 0); } - world.setBlockAndMetadataWithNotify(i, j, k, blockID, l); + world.setBlockAndMetadataWithNotify(i, j, k, blockID, l,1); } } diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index 8afcc224..9332b662 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -1,17 +1,21 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.energy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import buildcraft.core.DefaultProps; @@ -20,7 +24,6 @@ public class BlockPollution extends BlockContainer { public BlockPollution(int i) { super(i, Material.air); - blockIndexInTexture = 5 * 16 + 0; } @Override @@ -43,8 +46,10 @@ public class BlockPollution extends BlockContainer { return new TilePollution(); } - @SuppressWarnings({ "all" }) - public int getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int l) { - return 5 * 16 + iblockaccess.getBlockMetadata(i, j, k); + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + par1IconRegister.func_94245_a("buildcraft:blockPollution"); } } diff --git a/common/buildcraft/energy/BptBlockEngine.java b/common/buildcraft/energy/BptBlockEngine.java index 3d5d1422..b9ee6cfe 100644 --- a/common/buildcraft/energy/BptBlockEngine.java +++ b/common/buildcraft/energy/BptBlockEngine.java @@ -41,7 +41,7 @@ public class BptBlockEngine extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta); + context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); TileEngine engine = (TileEngine) context.world().getBlockTileEntity(slot.x, slot.y, slot.z); diff --git a/common/buildcraft/energy/OilBucketHandler.java b/common/buildcraft/energy/OilBucketHandler.java index e1fa9ae2..08a3ffa7 100644 --- a/common/buildcraft/energy/OilBucketHandler.java +++ b/common/buildcraft/energy/OilBucketHandler.java @@ -38,7 +38,7 @@ public class OilBucketHandler { if ((blockID == BuildCraftEnergy.oilStill.blockID || blockID == BuildCraftEnergy.oilMoving.blockID) && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) { - world.setBlockWithNotify(pos.blockX, pos.blockY, pos.blockZ, 0); + world.func_94575_c(pos.blockX, pos.blockY, pos.blockZ, 0); return new ItemStack(BuildCraftEnergy.bucketOil); } else diff --git a/common/buildcraft/energy/OilPopulate.java b/common/buildcraft/energy/OilPopulate.java index b47ee66c..da19c638 100644 --- a/common/buildcraft/energy/OilPopulate.java +++ b/common/buildcraft/energy/OilPopulate.java @@ -92,7 +92,7 @@ public class OilPopulate { int d2 = bx * bx + by * by + bz * bz; if (d2 <= r2) { - world.setBlockWithNotify(bx + cx, by + cy, bz + cz, BuildCraftEnergy.oilStill.blockID); + world.func_94575_c(bx + cx, by + cy, bz + cz, BuildCraftEnergy.oilStill.blockID); } } } @@ -121,11 +121,11 @@ public class OilPopulate { } for (int h = y + 1; h <= ymax; ++h) { - world.setBlockWithNotify(cx, h, cz, BuildCraftEnergy.oilStill.blockID); + world.func_94575_c(cx, h, cz, BuildCraftEnergy.oilStill.blockID); } } else if (started) { - world.setBlockWithNotify(cx, y, cz, BuildCraftEnergy.oilStill.blockID); + world.func_94575_c(cx, y, cz, BuildCraftEnergy.oilStill.blockID); } } @@ -176,12 +176,12 @@ public class OilPopulate { if (adjacentOil || force) { if (world.getBlockId(x, y, z) == Block.waterMoving.blockID || world.getBlockId(x, y, z) == Block.waterStill.blockID || isOil(world, x, y, z)) { - world.setBlockWithNotify(x, y, z, BuildCraftEnergy.oilStill.blockID); + world.func_94575_c(x, y, z, BuildCraftEnergy.oilStill.blockID); } else { - world.setBlockWithNotify(x, y, z, 0); + world.func_94575_c(x, y, z, 0); } - world.setBlockWithNotify(x, y - 1, z, BuildCraftEnergy.oilStill.blockID); + world.func_94575_c(x, y - 1, z, BuildCraftEnergy.oilStill.blockID); } } } diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java index ffae84ef..ad163e8c 100644 --- a/common/buildcraft/energy/TriggerEngineHeat.java +++ b/common/buildcraft/energy/TriggerEngineHeat.java @@ -64,7 +64,7 @@ public class TriggerEngineHeat extends Trigger { } @Override - public String getTextureFile() { + public String getTexture() { return DefaultProps.TEXTURE_TRIGGERS; } } diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index 94ec95ee..c97f1d3d 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -152,7 +152,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor float factor = (float) (1.0 / 16.0); - ForgeHooksClient.bindTexture(baseTexture, 0); + tileEntityRenderer.renderEngine.func_98187_b(baseTexture); box.render(factor); @@ -160,7 +160,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor movingBox.render(factor); GL11.glTranslatef(-translate[0] * translatefact, -translate[1] * translatefact, -translate[2] * translatefact); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber.png", 0); + tileEntityRenderer.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_BLOCKS + "/chamber.png"); float chamberf = 2F / 16F; @@ -190,7 +190,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor break; } - ForgeHooksClient.bindTexture(texture, 0); + tileEntityRenderer.renderEngine.func_98187_b(texture); trunk.render(factor); diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 2780f4ab..0f017e98 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -13,8 +13,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -31,8 +35,6 @@ public class BlockFrame extends Block implements IFramePipeConnection { public BlockFrame(int i) { super(i, Material.glass); - - blockIndexInTexture = 16 * 2 + 2; setHardness(0.5F); setTickRandomly(true); } @@ -44,7 +46,7 @@ public class BlockFrame extends Block implements IFramePipeConnection { int meta = world.getBlockMetadata(i, j, k); if (meta == 1 && random.nextInt(10) > 5) { - world.setBlockWithNotify(i, j, k, 0); + world.func_94575_c(i, j, k, 0); } } @@ -107,38 +109,38 @@ public class BlockFrame extends Block implements IFramePipeConnection { @SuppressWarnings("rawtypes") @Override - public void addCollidingBlockToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { + public void getCollisionBoxes(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); if (Utils.checkLegacyPipesConnections(world, i, j, k, i - 1, j, k)) { setBlockBounds(0.0F, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i + 1, j, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, 1.0F, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j - 1, k)) { setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j + 1, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j, k - 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, 0.0F, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j, k + 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, 1.0F); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); @@ -196,4 +198,11 @@ public class BlockFrame extends Block implements IFramePipeConnection { public void addCreativeItems(ArrayList itemList) { itemList.add(new ItemStack(this)); } + + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + par1IconRegister.func_94245_a("buildcraft:blockFrame"); + } } diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index b919a7fb..b9d5463c 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -60,7 +60,7 @@ public class BlockMiningWell extends BlockMachineRoot { public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack stack) { ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal()); + world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(),1); } @Override @@ -72,7 +72,7 @@ public class BlockMiningWell extends BlockMachineRoot { if (pipeID != BuildCraftFactory.plainPipeBlock.blockID) { break; } - world.setBlockWithNotify(x, depth, z, 0); + world.func_94575_c(x, depth, z, 0); } } diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index 2853c744..b5c7078c 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -1,8 +1,8 @@ -/** +/** * Copyright (c) SpaceToad, 2011 * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ @@ -12,8 +12,12 @@ package buildcraft.factory; import java.util.ArrayList; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import buildcraft.core.DefaultProps; @@ -25,8 +29,6 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { public BlockPlainPipe(int i) { super(i, Material.glass); - blockIndexInTexture = 16 * 2 + 0; - minX = Utils.pipeMinPos; minY = 0.0; minZ = Utils.pipeMinPos; @@ -75,4 +77,11 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { itemList.add(new ItemStack(this)); } + + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + par1IconRegister.func_94245_a("buildcraft:blockPlainPipe"); + } } diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index f4f19f71..df67db15 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -52,7 +52,7 @@ public class BlockQuarry extends BlockMachineRoot { ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal()); + world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(),1); if (entityliving instanceof EntityPlayer) { TileQuarry tq = (TileQuarry) world.getBlockTileEntity(i, j, k); tq.placedBy = (EntityPlayer) entityliving; @@ -94,7 +94,7 @@ public class BlockQuarry extends BlockMachineRoot { int meta = world.getBlockMetadata(i, j, k); if ((meta & 8) == 0) { - world.setBlockMetadata(i, j, k, meta | 8); + world.setBlockMetadataWithNotify(i, j, k, meta | 8,0); ForgeDirection[] dirs = ForgeDirection.VALID_DIRECTIONS; @@ -120,7 +120,7 @@ public class BlockQuarry extends BlockMachineRoot { private void markFrameForDecay(World world, int x, int y, int z) { if (world.getBlockId(x, y, z) == BuildCraftFactory.frameBlock.blockID) { - world.setBlockMetadata(x, y, z, 1); + world.setBlockMetadataWithNotify(x, y, z, 1,0); } } diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index b6da78d7..326963b5 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -70,7 +70,7 @@ public class BlockRefinery extends BlockContainer { ForgeDirection orientation = Utils.get2dOrientation(new Position(entityliving.posX, entityliving.posY, entityliving.posZ), new Position(i, j, k)); - world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal()); + world.setBlockMetadataWithNotify(i, j, k, orientation.getOpposite().ordinal(),1); } @Override @@ -86,17 +86,17 @@ public class BlockRefinery extends BlockContainer { switch (ForgeDirection.values()[meta]) { case WEST: - world.setBlockMetadata(i, j, k, ForgeDirection.SOUTH.ordinal()); + world.setBlockMetadataWithNotify(i, j, k, ForgeDirection.SOUTH.ordinal(),0); break; case EAST: - world.setBlockMetadata(i, j, k, ForgeDirection.NORTH.ordinal()); + world.setBlockMetadataWithNotify(i, j, k, ForgeDirection.NORTH.ordinal(),0); break; case NORTH: - world.setBlockMetadata(i, j, k, ForgeDirection.WEST.ordinal()); + world.setBlockMetadataWithNotify(i, j, k, ForgeDirection.WEST.ordinal(),0); break; case SOUTH: default: - world.setBlockMetadata(i, j, k, ForgeDirection.EAST.ordinal()); + world.setBlockMetadataWithNotify(i, j, k, ForgeDirection.EAST.ordinal(),0); break; } ((IToolWrench) equipped).wrenchUsed(entityplayer, i, j, k); diff --git a/common/buildcraft/factory/BptBlockTank.java b/common/buildcraft/factory/BptBlockTank.java index 89791c8e..3630d8dc 100644 --- a/common/buildcraft/factory/BptBlockTank.java +++ b/common/buildcraft/factory/BptBlockTank.java @@ -17,7 +17,7 @@ public class BptBlockTank extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta); + context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); } } diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java index 7f78f6ad..a0b1104c 100644 --- a/common/buildcraft/factory/EntityMechanicalArm.java +++ b/common/buildcraft/factory/EntityMechanicalArm.java @@ -71,17 +71,11 @@ public class EntityMechanicalArm extends Entity { } private void makeParts(World world) { - xArm = new EntityBlock(world, 0, 0, 0, 1, 0.5, 0.5); - xArm.texture = BuildCraftFactory.drillTexture; + xArm = FactoryProxy.proxy.newDrill(world, 0, 0, 0, 1, 0.5, 0.5); + yArm = FactoryProxy.proxy.newDrill(world, 0, 0, 0, 0.5, 1, 0.5); + zArm = FactoryProxy.proxy.newDrill(world, 0, 0, 0, 0.5, 0.5, 1); - yArm = new EntityBlock(world, 0, 0, 0, 0.5, 1, 0.5); - yArm.texture = BuildCraftFactory.drillTexture; - - zArm = new EntityBlock(world, 0, 0, 0, 0.5, 0.5, 1); - zArm.texture = BuildCraftFactory.drillTexture; - - head = new EntityBlock(world, 0, 0, 0, 0.2, 1, 0.2); - head.texture = 2 * 16 + 10; + head = FactoryProxy.proxy.newDrillHead(world, 0, 0, 0, 0.2, 1, 0.2); head.shadowSize = 1.0F; world.spawnEntityInWorld(xArm); diff --git a/common/buildcraft/factory/FactoryProxy.java b/common/buildcraft/factory/FactoryProxy.java index 0f7f6769..47d097be 100644 --- a/common/buildcraft/factory/FactoryProxy.java +++ b/common/buildcraft/factory/FactoryProxy.java @@ -1,5 +1,7 @@ package buildcraft.factory; +import net.minecraft.world.World; +import buildcraft.core.EntityBlock; import cpw.mods.fml.common.SidedProxy; public class FactoryProxy { @@ -14,4 +16,19 @@ public class FactoryProxy { public void initializeNEIIntegration() { } + + public EntityBlock newPumpTube(World w) + { + return new EntityBlock(w); + } + + public EntityBlock newDrill(World w, double i, double j, double k, double l, double d, double e) + { + return new EntityBlock(w, i, j, k, l, d, e); + } + + public EntityBlock newDrillHead(World w, double i, double j, double k, double l, double d, double e) + { + return new EntityBlock(w, i, j, k, l, d, e); + } } diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 8008a6c6..f3df217b 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -2,8 +2,14 @@ package buildcraft.factory; import java.lang.reflect.Method; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.Icon; +import net.minecraft.world.World; + import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; +import buildcraft.core.EntityBlock; import buildcraft.core.render.RenderVoid; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; @@ -15,7 +21,11 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; public class FactoryProxyClient extends FactoryProxy { - @Override + private Icon pumpTexture; + private Icon drillTexture; + private Icon drillHeadTexture; + + @Override public void initializeTileEntities() { super.initializeTileEntities(); ClientRegistry.bindTileEntitySpecialRenderer(TileTank.class, new RenderTank()); @@ -32,6 +42,10 @@ public class FactoryProxyClient extends FactoryProxy { @Override public void initializeEntityRenders() { RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid()); + TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.field_94154_l; + pumpTexture = terrainTextures.func_94245_a("buildcraft:blockPumpTubeTexture"); + drillTexture = terrainTextures.func_94245_a("buildcraft:blockDrillTexture"); + drillHeadTexture = terrainTextures.func_94245_a("buildcraft:blockDrillHeadTexture"); } @Override @@ -45,4 +59,28 @@ public class FactoryProxyClient extends FactoryProxy { BuildCraftCore.bcLog.fine("NEI not detected."); } } + + @Override + public EntityBlock newPumpTube(World w) + { + EntityBlock eb = super.newPumpTube(w); + eb.texture = pumpTexture; + return eb; + } + + @Override + public EntityBlock newDrill(World w, double i, double j, double k, double l, double d, double e) + { + EntityBlock eb = super.newDrill(w, i, j, k, l, d, e); + eb.texture = drillTexture; + return eb; + } + + @Override + public EntityBlock newDrillHead(World w, double i, double j, double k, double l, double d, double e) + { + EntityBlock eb = super.newDrillHead(w, i, j, k, l, d, e); + eb.texture = drillHeadTexture; + return eb; + } } diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index a3c3f92c..8a134e07 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -36,7 +36,7 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { private ItemStack stackList[] = new ItemStack[9]; private IRecipe currentRecipe = null; - + class LocalInventoryCrafting extends InventoryCrafting { public LocalInventoryCrafting() { @@ -193,7 +193,7 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { if(this.currentRecipe == null || !this.currentRecipe.matches(craftMatrix, worldObj)) currentRecipe = buildcraft.core.utils.CraftingHelper.findMatchingRecipe(craftMatrix, worldObj); - + ItemStack resultStack = null; if(currentRecipe != null) { resultStack = currentRecipe.getCraftingResult(craftMatrix); @@ -274,22 +274,22 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { public StackPointer getNearbyItemFromOrientation(ItemStack itemStack, ForgeDirection direction) { TileEntity tile = worldObj.getBlockTileEntity(xCoord + direction.offsetX, yCoord + direction.offsetY, zCoord + direction.offsetZ); - + if (tile instanceof ISpecialInventory) { // Don't get stuff out of ISpecialInventory for now / we wouldn't // know how to put it back... And it's not clear if we want to // have workbenches automatically getting things from one another. return null; } - + IInventory inventory = null; if (tile instanceof ISidedInventory){ inventory = new SidedInventoryAdapter((ISidedInventory) tile, direction.getOpposite()); } else if (tile instanceof IInventory) { inventory = Utils.getInventory((IInventory) tile); } - - if (inventory == null) return null; + + if (inventory == null) return null; for (int j = 0; j < inventory.getSizeInventory(); ++j) { ItemStack stack = inventory.getStackInSlot(j); @@ -407,4 +407,18 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { return new ItemStack[] { extractItem(doRemove, false) }; } + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } + } diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 7de83b7b..e531ca18 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -61,7 +61,7 @@ public class TileMiningWell extends TileMachine implements IMachine, IPowerRecep List stacks = BlockUtil.getItemStackFromBlock(worldObj, xCoord, depth, zCoord); - world.setBlockWithNotify(xCoord, depth, zCoord, BuildCraftFactory.plainPipeBlock.blockID); + world.func_94575_c(xCoord, depth, zCoord, BuildCraftFactory.plainPipeBlock.blockID); if (blockId == 0) return; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index 00a49cf4..1eba9d37 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -23,6 +23,7 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; @@ -89,7 +90,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor, I index = getNextIndexToPump(true); if (liquidToPump.itemID != Block.waterStill.blockID || BuildCraftCore.consumeWaterSources) { - worldObj.setBlockWithNotify(index.i, index.j, index.k, 0); + worldObj.func_94575_c(index.i, index.j, index.k, 0); } tank.fill(liquidToPump, true); @@ -140,8 +141,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor, I @Override public void initialize() { - tube = new EntityBlock(worldObj); - tube.texture = 6 * 16 + 6; + tube = FactoryProxy.proxy.newPumpTube(worldObj); if (!Double.isNaN(tubeY)) { tube.posY = tubeY; diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 86126fb2..d3a1f4be 100755 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -417,7 +417,7 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor, } worldObj.playAuxSFXAtEntity(null, 2001, i, j, k, blockId + (worldObj.getBlockMetadata(i, j, k) << 12)); - worldObj.setBlockWithNotify(i, j, k, 0); + worldObj.func_94575_c(i, j, k, 0); } // Collect any lost items laying around diff --git a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java index c892548e..0946b844 100644 --- a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java +++ b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java @@ -52,7 +52,7 @@ public class ContainerAutoWorkbench extends BuildCraftContainer { thePlayer.addStat(AchievementList.buildWorkBench, 1); } else if (itemstack.itemID == Item.pickaxeWood.itemID) { thePlayer.addStat(AchievementList.buildPickaxe, 1); - } else if (itemstack.itemID == Block.stoneOvenIdle.blockID) { + } else if (itemstack.itemID == Block.furnaceIdle.blockID) { thePlayer.addStat(AchievementList.buildFurnace, 1); } else if (itemstack.itemID == Item.hoeWood.itemID) { thePlayer.addStat(AchievementList.buildHoe, 1); diff --git a/common/buildcraft/factory/gui/GuiAutoCrafting.java b/common/buildcraft/factory/gui/GuiAutoCrafting.java index e2783d91..52926d88 100644 --- a/common/buildcraft/factory/gui/GuiAutoCrafting.java +++ b/common/buildcraft/factory/gui/GuiAutoCrafting.java @@ -41,9 +41,8 @@ public class GuiAutoCrafting extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture("/gui/crafting.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b("/gui/crafting.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/factory/gui/GuiHopper.java b/common/buildcraft/factory/gui/GuiHopper.java index 11892b22..33199bc7 100644 --- a/common/buildcraft/factory/gui/GuiHopper.java +++ b/common/buildcraft/factory/gui/GuiHopper.java @@ -17,9 +17,8 @@ public class GuiHopper extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 2e3154ba..ffdba5d3 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -54,9 +54,8 @@ public class GuiRefinery extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index 1ef1bb39..8ee5426d 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -55,10 +55,10 @@ public class RenderHopper extends TileEntitySpecialRenderer implements IInventor GL11.glDisable(GL11.GL_LIGHTING); GL11.glTranslated(x, y, z); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper.png", 0); + tileEntityRenderer.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper.png"); top.render((float) (1.0 / 16.0)); bottom.render((float) (1.0 / 16.0)); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper_middle.png", 0); + tileEntityRenderer.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_BLOCKS + "/hopper_middle.png"); middle.render(Tessellator.instance, 1F / 16F); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index 4f467d1f..0a32a1a0 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -189,7 +189,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent GL11.glRotatef(angle, 0, 1, 0); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_PATH_BLOCKS + "/refinery.png", 0); + tileEntityRenderer.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_BLOCKS + "/refinery.png"); GL11.glTranslatef(-4F * factor, 0, -4F * factor); tank.render(factor); GL11.glTranslatef(4F * factor, 0, 4F * factor); @@ -263,11 +263,5 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent } public void setTextureFor(int liquidId) { - if (liquidId < Block.blocksList.length && Block.blocksList[liquidId] != null) { - ForgeHooksClient.bindTexture(Block.blocksList[liquidId].getTextureFile(), 0); - } else { - ForgeHooksClient.bindTexture(Item.itemsList[liquidId].getTextureFile(), 0); - } - } } diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index 0fc49e37..75a40d12 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -86,20 +86,9 @@ public class RenderTank extends TileEntitySpecialRenderer { int[] displayList = getDisplayLists(liquid.itemID, liquid.itemMeta, tileentity.worldObj); if (displayList == null) return; - - String textureFile; - if (liquid.itemID < Block.blocksList.length && Block.blocksList[liquid.itemID] != null) { - textureFile = Block.blocksList[liquid.itemID].getTextureFile(); - } else if (Item.itemsList[liquid.itemID] != null){ - textureFile = Item.itemsList[liquid.itemID].getTextureFile(); - } else { - return; - } GL11.glPushMatrix(); GL11.glDisable(2896 /* GL_LIGHTING */); - - ForgeHooksClient.bindTexture(textureFile, 0); GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F); diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index 790eb22b..2711631e 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -11,6 +11,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftSilicon; import buildcraft.core.CreativeTabBuildCraft; @@ -63,7 +64,7 @@ public class BlockAssemblyTable extends BlockContainer { } @Override - public int getBlockTextureFromSideAndMetadata(int i, int j) { + public Icon getBlockTextureFromSideAndMetadata(int i, int j) { if (i == 1) { return j == 0 ? 16 * 6 + 12 : 16 * 3 + 15; } else if (i == 0) { @@ -74,7 +75,7 @@ public class BlockAssemblyTable extends BlockContainer { } @Override - public TileEntity createNewTileEntity(World world, int metadata) { + public TileEntity createTileEntity(World world, int metadata) { return metadata == 0 ? new TileAssemblyTable() : new TileAssemblyAdvancedWorkbench(); } diff --git a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java index 4aa1b058..92457ef6 100644 --- a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java @@ -466,4 +466,18 @@ public class TileAssemblyAdvancedWorkbench extends TileEntity implements IInvent iCrafting.sendProgressBarUpdate(container, 5, (lRecentEnergy >>> 16) & 0xFFFF); } + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } + } diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index 8dbeb10a..770c0ddb 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -492,4 +492,18 @@ public class TileAssemblyTable extends TileEntity implements IMachine, IInventor public int getZCoord() { return zCoord; } + + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java index bc5a147b..cdbca78a 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java @@ -97,9 +97,8 @@ public class GuiAssemblyAdvancedWorkbench extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/assembly_advancedworkbench.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/assembly_advancedworkbench.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 0b4bd810..0192b6fd 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -139,9 +139,8 @@ public class GuiAssemblyTable extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 346c8031..28638638 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -26,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; @@ -96,41 +97,41 @@ public class BlockGenericPipe extends BlockContainer { @SuppressWarnings("rawtypes") @Override - public void addCollidingBlockToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { + public void getCollisionBoxes(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); TileEntity tile1 = world.getBlockTileEntity(i, j, k); TileGenericPipe tileG = (TileGenericPipe) tile1; if (Utils.checkPipesConnections(world, tile1, i - 1, j, k)) { setBlockBounds(0.0F, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i + 1, j, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, 1.0F, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j - 1, k)) { setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j + 1, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j, k - 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, 0.0F, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j, k + 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, 1.0F); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG != null) { @@ -138,32 +139,32 @@ public class BlockGenericPipe extends BlockContainer { if (tileG.hasFacade(ForgeDirection.EAST)) { setBlockBounds(1 - facadeThickness, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.WEST)) { setBlockBounds(0.0F, 0.0F, 0.0F, facadeThickness, 1.0F, 1.0F); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.UP)) { setBlockBounds(0.0F, 1 - facadeThickness, 0.0F, 1.0F, 1.0F, 1.0F); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.DOWN)) { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, facadeThickness, 1.0F); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.SOUTH)) { setBlockBounds(0.0F, 0.0F, 1 - facadeThickness, 1.0F, 1.0F, 1.0F); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.NORTH)) { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, facadeThickness); - super.addCollidingBlockToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); } } @@ -703,12 +704,12 @@ public class BlockGenericPipe extends BlockContainer { } @SuppressWarnings({ "all" }) - public int getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int l) { + public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int l) { TileEntity tile = iblockaccess.getBlockTileEntity(i, j, k); if (!(tile instanceof IPipeRenderState)) - return 0; - return ((IPipeRenderState) tile).getRenderState().currentTextureIndex; + return null; + return ((IPipeRenderState) tile).getRenderState().currentTexture; // Pipe pipe = getPipe(iblockaccess, i, j, k); // if (!isValid(pipe)) { @@ -746,13 +747,13 @@ public class BlockGenericPipe extends BlockContainer { } @Override - public boolean isProvidingStrongPower(IBlockAccess iblockaccess, int x, int y, int z, int l) { + public int isProvidingStrongPower(IBlockAccess iblockaccess, int x, int y, int z, int l) { Pipe pipe = getPipe(iblockaccess, x, y, z); if (isValid(pipe)) return pipe.isPoweringTo(l); else - return false; + return 0; } @Override @@ -761,13 +762,13 @@ public class BlockGenericPipe extends BlockContainer { } @Override - public boolean isProvidingWeakPower(IBlockAccess world, int i, int j, int k, int l) { + public int isProvidingWeakPower(IBlockAccess world, int i, int j, int k, int l) { Pipe pipe = getPipe(world, i, j, k); if (isValid(pipe)) return pipe.isIndirectlyPoweringTo(l); else - return false; + return 0; } @SuppressWarnings({ "all" }) @@ -823,7 +824,7 @@ public class BlockGenericPipe extends BlockContainer { if (world.isRemote) return true; - boolean placed = world.setBlockAndMetadataWithNotify(i, j, k, blockId, meta); + boolean placed = world.setBlockAndMetadataWithNotify(i, j, k, blockId, meta,1); if (placed) { diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 06dfacc0..ed8b93b3 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -65,7 +65,7 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { if (itemstack.stackSize == 0) return false; - if (entityplayer.canCurrentToolHarvestBlock(i, j, k) && world.canPlaceEntityOnSide(blockID, i, j, k, false, side, entityplayer)) { + if (entityplayer.canCurrentToolHarvestBlock(i, j, k) && world.canPlaceEntityOnSide(blockID, i, j, k, false, side, entityplayer,itemstack)) { Pipe pipe = BlockGenericPipe.createPipe(itemID); if (pipe == null) { diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 9588ed4c..f74ea5bb 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -123,7 +123,7 @@ public abstract class Pipe implements IPipe, IDropControlInventory { logic.onBlockPlaced(); transport.onBlockPlaced(); } - + public void onBlockPlacedBy(EntityLiving placer) {} public void onNeighborBlockChange(int blockId) { @@ -144,7 +144,7 @@ public abstract class Pipe implements IPipe, IDropControlInventory { /** * Should return the textureindex in the file specified by getTextureFile() - * + * * @param direction * The orientation for the texture that is requested. Unknown for the center pipe center * @return the index in the texture sheet @@ -154,7 +154,7 @@ public abstract class Pipe implements IPipe, IDropControlInventory { /** * Should return the textureindex used by the Pipe Item Renderer, as this is done client-side the default implementation might not work if your * getTextureIndex(Orienations.Unknown) has logic - * + * * @return */ public int getTextureIndexForItem() { @@ -374,20 +374,20 @@ public abstract class Pipe implements IPipe, IDropControlInventory { return false; } - public boolean isPoweringTo(int l) { + public int isPoweringTo(int l) { if (!broadcastRedstone) - return false; + return 0; ForgeDirection o = ForgeDirection.values()[l].getOpposite(); TileEntity tile = container.getTile(o); if (tile instanceof TileGenericPipe && Utils.checkPipesConnections(this.container, tile)) - return false; + return 0; - return true; + return 15; } - public boolean isIndirectlyPoweringTo(int l) { + public int isIndirectlyPoweringTo(int l) { return isPoweringTo(l); } diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index 2e43fcc9..7ed6fbc2 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -4,6 +4,8 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import net.minecraft.util.Icon; + import buildcraft.core.DefaultProps; import buildcraft.core.network.IClientState; import buildcraft.transport.utils.ConnectionMatrix; @@ -28,7 +30,7 @@ public class PipeRenderState implements IClientState { /* * This is a placeholder for the pipe renderer to set to a value that the BlockGenericPipe->TileGenericPipe will then return the the WorldRenderer */ - public int currentTextureIndex; + public Icon currentTexture; public PipeRenderState() { // for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS){ diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 87e55a1b..e1a5c9e8 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -244,7 +244,7 @@ public class PipeTransportPower extends PipeTransport { if (internalNextPower[from.ordinal()] >= MAX_POWER_INTERNAL) { worldObj.createExplosion(null, xCoord, yCoord, zCoord, 3, false); - worldObj.setBlockWithNotify(xCoord, yCoord, zCoord, 0); + worldObj.func_94575_c(xCoord, yCoord, zCoord, 0); } } } diff --git a/common/buildcraft/transport/blueprints/BptItemPipeIron.java b/common/buildcraft/transport/blueprints/BptItemPipeIron.java index 1ae7157c..3a7ceb62 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeIron.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeIron.java @@ -30,7 +30,7 @@ public class BptItemPipeIron extends BptItem { @Override public void postProcessing(BptSlotInfo slot, IBptContext context) { - context.world().setBlockMetadata(slot.x, slot.y, slot.z, slot.meta); + context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,0); } @Override diff --git a/common/buildcraft/transport/blueprints/BptItemPipeWooden.java b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java index 4bfaa47e..6fb4d146 100644 --- a/common/buildcraft/transport/blueprints/BptItemPipeWooden.java +++ b/common/buildcraft/transport/blueprints/BptItemPipeWooden.java @@ -30,7 +30,7 @@ public class BptItemPipeWooden extends BptItem { @Override public void postProcessing(BptSlotInfo slot, IBptContext context) { - context.world().setBlockMetadata(slot.x, slot.y, slot.z, slot.meta); + context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,0); } @Override diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index a8a919a6..8f6f7d91 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -55,9 +55,8 @@ public class GuiDiamondPipe extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/filter.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/filter.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/gui/GuiEmeraldPipe.java b/common/buildcraft/transport/gui/GuiEmeraldPipe.java index 3b04b342..e0d39f60 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldPipe.java @@ -52,9 +52,8 @@ public class GuiEmeraldPipe extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { - int i = mc.renderEngine.getTexture(DefaultProps.TEXTURE_PATH_GUI + "/filter_2.png"); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(i); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/filter_2.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index ce33d98a..54c45e94 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -13,9 +13,13 @@ import java.util.Iterator; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; @@ -53,22 +57,14 @@ public class GuiGateInterface extends GuiAdvancedInterface { return ""; } + @SideOnly(Side.CLIENT) @Override - public String getTexture() { + public Icon getTexture() { ITrigger trigger = pipe.getTrigger(slot); if (trigger != null) - return trigger.getTextureFile(); + return trigger.getTexture(); else - return ""; - } - - @Override - public int getTextureIndex() { - ITrigger trigger = pipe.getTrigger(slot); - if (trigger != null) - return trigger.getIndexInTexture(); - else - return 0; + return null; } @Override @@ -102,22 +98,14 @@ public class GuiGateInterface extends GuiAdvancedInterface { return ""; } + @SideOnly(Side.CLIENT) @Override - public String getTexture() { + public Icon getTexture() { IAction action = pipe.getAction(slot); if (action != null) return action.getTexture(); else - return ""; - } - - @Override - public int getTextureIndex() { - IAction action = pipe.getAction(slot); - if (action != null) - return action.getIndexInTexture(); - else - return 0; + return null; } @Override @@ -250,12 +238,10 @@ public class GuiGateInterface extends GuiAdvancedInterface { protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { _container.synchronize(); - int texture = 0; - texture = mc.renderEngine.getTexture(_container.getGateGuiFile()); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.func_98187_b(_container.getGateGuiFile()); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(texture); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index 24bd9a5e..90fc7f30 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -96,7 +96,7 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory for (ItemStack stack : stacks) { if(stack == null) continue; - + boolean matches = false; for (int i = 0; i < filters.getSizeInventory(); i++) { ItemStack filter = filters.getStackInSlot(i); @@ -293,4 +293,18 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory } } + + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index a34bfa8e..57d08b48 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -13,6 +13,7 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityMinecart; +import net.minecraft.entity.item.EntityMinecartChest; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -166,9 +167,9 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { return true; } - if (distance == 1 && list.get(g) instanceof EntityMinecart) { - EntityMinecart cart = (EntityMinecart) list.get(g); - if (!cart.isDead && cart.minecartType == 1) { + if (distance == 1 && list.get(g) instanceof EntityMinecartChest) { + EntityMinecartChest cart = (EntityMinecartChest) list.get(g); + if (!cart.isDead) { ItemStack stack = checkExtractGeneric(cart, true, getOpenOrientation()); if (stack != null && powerProvider.useEnergy(1, 1, true) == 1) { EntityItem entityitem = new EntityItem(worldObj, cart.posX, cart.posY + 0.3F, cart.posZ, stack); @@ -216,7 +217,7 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { if (entity instanceof EntityItem) { EntityItem item = (EntityItem) entity; ItemStack contained = item.getEntityItem(); - + CoreProxy.proxy.obsidianPipePickup(worldObj, item, this.container); float energyUsed = powerProvider.useEnergy(distance, contained.stackSize * distance, true); diff --git a/common/buildcraft/transport/pipes/PipeLogicDiamond.java b/common/buildcraft/transport/pipes/PipeLogicDiamond.java index 8b8c64a9..5076deb3 100644 --- a/common/buildcraft/transport/pipes/PipeLogicDiamond.java +++ b/common/buildcraft/transport/pipes/PipeLogicDiamond.java @@ -133,4 +133,18 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory { } + @Override + public boolean func_94042_c() + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean func_94041_b(int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } + } diff --git a/common/buildcraft/transport/pipes/PipeLogicIron.java b/common/buildcraft/transport/pipes/PipeLogicIron.java index 3713f732..fcb64274 100644 --- a/common/buildcraft/transport/pipes/PipeLogicIron.java +++ b/common/buildcraft/transport/pipes/PipeLogicIron.java @@ -57,7 +57,7 @@ public class PipeLogicIron extends PipeLogic { if (tile instanceof IPipeEntry || tile instanceof IInventory || tile instanceof ITankContainer || tile instanceof TileGenericPipe) { - worldObj.setBlockMetadata(xCoord, yCoord, zCoord, nextMetadata); + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, nextMetadata,0); container.scheduleRenderUpdate(); return; } @@ -75,7 +75,7 @@ public class PipeLogicIron extends PipeLogic { public void onBlockPlaced() { super.onBlockPlaced(); - worldObj.setBlockMetadata(xCoord, yCoord, zCoord, 1); + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 1,0); switchPosition(); } diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index f21dd5eb..19bb1f16 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -43,7 +43,7 @@ public class PipeLogicWood extends PipeLogic { } if (newMeta != meta) { - worldObj.setBlockMetadata(xCoord, yCoord, zCoord, newMeta); + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta,0); container.scheduleRenderUpdate(); // worldObj.markBlockNeedsUpdate(xCoord, yCoord, zCoord); } diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 3c6f63ea..a723f0ec 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -21,7 +21,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { /** * Mirrors the array on the Y axis by calculating offsets from 0.5F - * + * * @param targetArray */ private void mirrorY(float[][] targetArray) { @@ -33,7 +33,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { /** * Shifts the coordinates around effectivly rotating something. Zero state is DOWN then -> NORTH -> WEST Note - To obtain Pos, do a mirrorY() before * rotating - * + * * @param targetArray * the array that should be rotated */ @@ -63,7 +63,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { /** * Clones both dimensions of a float[][] - * + * * @param source * the float[][] to deepClone * @return @@ -81,50 +81,48 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { float minSize = Utils.pipeMinPos; float maxSize = Utils.pipeMaxPos; - ForgeHooksClient.bindTexture(state.getTextureFile(), 0); - - state.currentTextureIndex = state.textureMatrix.getTextureIndex(ForgeDirection.UNKNOWN); + state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.UNKNOWN); block.setBlockBounds(minSize, minSize, minSize, maxSize, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); if (state.pipeConnectionMatrix.isConnected(ForgeDirection.WEST)) { - state.currentTextureIndex = state.textureMatrix.getTextureIndex(ForgeDirection.WEST); + state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.WEST); block.setBlockBounds(0.0F, minSize, minSize, minSize, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.EAST)) { - state.currentTextureIndex = state.textureMatrix.getTextureIndex(ForgeDirection.EAST); + state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.EAST); block.setBlockBounds(maxSize, minSize, minSize, 1.0F, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.DOWN)) { - state.currentTextureIndex = state.textureMatrix.getTextureIndex(ForgeDirection.DOWN); + state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.DOWN); block.setBlockBounds(minSize, 0.0F, minSize, maxSize, minSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.UP)) { - state.currentTextureIndex = state.textureMatrix.getTextureIndex(ForgeDirection.UP); + state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.UP); block.setBlockBounds(minSize, maxSize, minSize, maxSize, 1.0F, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.NORTH)) { - state.currentTextureIndex = state.textureMatrix.getTextureIndex(ForgeDirection.NORTH); + state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.NORTH); block.setBlockBounds(minSize, minSize, 0.0F, maxSize, maxSize, minSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.SOUTH)) { - state.currentTextureIndex = state.textureMatrix.getTextureIndex(ForgeDirection.SOUTH); + state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.SOUTH); block.setBlockBounds(minSize, minSize, maxSize, maxSize, maxSize, 1.0F); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); @@ -132,25 +130,23 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_BLOCKS, 0); - if (state.wireMatrix.hasWire(WireColor.Red)) { - state.currentTextureIndex = state.wireMatrix.getTextureIndex(WireColor.Red); + state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Red); pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMinPos, IPipe.WireColor.Red, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Blue)) { - state.currentTextureIndex = state.wireMatrix.getTextureIndex(WireColor.Blue); + state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Blue); pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos, IPipe.WireColor.Blue, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Green)) { - state.currentTextureIndex = state.wireMatrix.getTextureIndex(WireColor.Green); + state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Green); pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMinPos, Utils.pipeMinPos, IPipe.WireColor.Green, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Yellow)) { - state.currentTextureIndex = state.wireMatrix.getTextureIndex(WireColor.Yellow); + state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Yellow); pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, IPipe.WireColor.Yellow, x, y, z); } @@ -180,7 +176,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if (state.facadeMatrix.isConnected(direction)) { ForgeHooksClient.bindTexture(state.facadeMatrix.getTextureFile(direction), 0); - state.currentTextureIndex = state.facadeMatrix.getTextureIcon(direction); + state.currentTexture = state.facadeMatrix.getTextureIcon(direction); // Hollow facade if (state.pipeConnectionMatrix.isConnected(direction)) { @@ -238,8 +234,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { zeroState[2][0] = Utils.pipeMinPos; zeroState[2][1] = Utils.pipeMaxPos; - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_BLOCKS, 0); - state.currentTextureIndex = 7 * 16 + 13; // Structure Pipe + state.currentTexture = 7 * 16 + 13; // Structure Pipe for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if (state.facadeMatrix.isConnected(direction) && !state.pipeConnectionMatrix.isConnected(direction)) { @@ -474,7 +469,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { private void pipeGateRender(RenderBlocks renderblocks, Block block, PipeRenderState state, int x, int y, int z) { - state.currentTextureIndex = state.getGateTextureIndex(); + state.currentTexture = state.getGateTextureIndex(); float min = Utils.pipeMinPos + 0.05F; float max = Utils.pipeMaxPos - 0.05F; diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index 5b325da5..5cacf0da 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -275,8 +275,6 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glDisable(2896 /* GL_LIGHTING */); - ForgeHooksClient.bindTexture(DefaultProps.TEXTURE_BLOCKS, 0); - GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F); int[] displayList = pow.overload ? displayPowerListOverload : displayPowerList; @@ -396,12 +394,6 @@ public class RenderPipe extends TileEntitySpecialRenderer { if (liquidId == 0) return null; - if (liquidId < Block.blocksList.length && Block.blocksList[liquidId] != null) { - ForgeHooksClient.bindTexture(Block.blocksList[liquidId].getTextureFile(), 0); - } else if (Item.itemsList[liquidId] != null) { - ForgeHooksClient.bindTexture(Item.itemsList[liquidId].getTextureFile(), 0); - } else - return null; return getDisplayLiquidLists(liquidId, stack.itemMeta, world); } diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index 85dda0ba..6aa90955 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -139,7 +139,7 @@ public class TriggerPipeContents extends Trigger implements ITriggerPipe { } @Override - public String getTextureFile() { + public String getTexture() { return DefaultProps.TEXTURE_TRIGGERS; } diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java index 258fc2d2..b007d137 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -100,7 +100,7 @@ public class TriggerPipeSignal extends Trigger implements ITriggerPipe { } @Override - public String getTextureFile() { + public String getTexture() { return DefaultProps.TEXTURE_TRIGGERS; } } diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java index 7df9055f..e3d3833b 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -50,7 +50,7 @@ public class TriggerRedstoneInput extends Trigger implements ITriggerPipe { } @Override - public String getTextureFile() { + public String getTexture() { return DefaultProps.TEXTURE_TRIGGERS; } } From 365a0c0a478e09055168aec2013bbcbb13d02e0b Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 9 Mar 2013 02:26:11 +0100 Subject: [PATCH 03/93] Renamed pipe related textures Ported Pipe textures (Pipe "api" changed for submods) Ported Wire textures Updated pipe sync to accomodate Icons Updated all pipes to new "api" Nerfed Herobrine --- ..._7_13.png => PipeStructureCobblestone.png} | Bin ...lock_6_14.png => pipeAllEmerald_solid.png} | Bin .../{block_1_3.png => pipeAllIron_solid.png} | Bin .../{block_1_15.png => pipeAllWood_solid.png} | Bin ...block_1_1.png => pipeItemsCobblestone.png} | Bin ...ck_1_5.png => pipeItemsDiamond_center.png} | Bin ...lock_1_6.png => pipeItemsDiamond_down.png} | Bin ...ock_1_11.png => pipeItemsDiamond_east.png} | Bin ...ock_1_8.png => pipeItemsDiamond_north.png} | Bin ...ock_1_9.png => pipeItemsDiamond_south.png} | Bin ...{block_1_7.png => pipeItemsDiamond_up.png} | Bin ...ock_1_10.png => pipeItemsDiamond_west.png} | Bin ...6_13.png => pipeItemsEmerald_standard.png} | Bin .../{block_1_14.png => pipeItemsGold.png} | Bin ...ock_1_2.png => pipeItemsIron_standard.png} | Bin .../{block_1_12.png => pipeItemsObsidian.png} | Bin ...{block_8_15.png => pipeItemsSandstone.png} | Bin .../{block_1_13.png => pipeItemsStone.png} | Bin .../{block_8_14.png => pipeItemsVoid.png} | Bin ...ock_1_0.png => pipeItemsWood_standard.png} | Bin ...ock_7_1.png => pipeLiquidsCobblestone.png} | Bin ...15.png => pipeLiquidsEmerald_standard.png} | Bin .../{block_7_4.png => pipeLiquidsGold.png} | Bin ...k_7_3.png => pipeLiquidsIron_standard.png} | Bin ...lock_9_15.png => pipeLiquidsSandstone.png} | Bin .../{block_7_2.png => pipeLiquidsStone.png} | Bin .../{block_9_14.png => pipeLiquidsVoid.png} | Bin ...k_7_0.png => pipeLiquidsWood_standard.png} | Bin .../{block_7_10.png => pipePowerGold.png} | Bin .../{block_7_8.png => pipePowerStone.png} | Bin ...ock_7_6.png => pipePowerWood_standard.png} | Bin .../{block_0_7.png => texture_blue_dark.png} | Bin .../{block_0_8.png => texture_blue_lit.png} | Bin .../{block_0_4.png => texture_cyan.png} | Bin .../{block_0_9.png => texture_green_dark.png} | Bin .../{block_0_10.png => texture_green_lit.png} | Bin .../{block_0_5.png => texture_red_dark.png} | Bin .../{block_0_6.png => texture_red_lit.png} | Bin ...block_0_11.png => texture_yellow_dark.png} | Bin ...{block_0_12.png => texture_yellow_lit.png} | Bin common/buildcraft/BuildCraftTransport.java | 13 ++-- .../transport/BlockGenericPipe.java | 2 +- .../transport/IPipeRenderState.java | 3 + .../buildcraft/transport/IconConstants.java | 50 ++++++++++++++ common/buildcraft/transport/ItemPipe.java | 22 +++---- common/buildcraft/transport/Pipe.java | 40 +++++++----- .../buildcraft/transport/PipeRenderState.java | 23 ------- .../buildcraft/transport/TileGenericPipe.java | 41 +++--------- .../buildcraft/transport/TransportProxy.java | 4 ++ .../transport/TransportProxyClient.java | 61 ++++++++++++++++++ .../transport/pipes/PipeItemsCobblestone.java | 14 ++-- .../transport/pipes/PipeItemsDiamond.java | 25 +++++-- .../transport/pipes/PipeItemsEmerald.java | 5 +- .../transport/pipes/PipeItemsGold.java | 31 ++++----- .../transport/pipes/PipeItemsIron.java | 22 ++++--- .../transport/pipes/PipeItemsObsidian.java | 15 +++-- .../transport/pipes/PipeItemsSandstone.java | 14 ++-- .../transport/pipes/PipeItemsStone.java | 15 +++-- .../transport/pipes/PipeItemsVoid.java | 14 ++-- .../transport/pipes/PipeItemsWood.java | 24 ++++--- .../pipes/PipeLiquidsCobblestone.java | 14 ++-- .../transport/pipes/PipeLiquidsEmerald.java | 5 +- .../transport/pipes/PipeLiquidsGold.java | 14 ++-- .../transport/pipes/PipeLiquidsIron.java | 23 ++++--- .../transport/pipes/PipeLiquidsSandstone.java | 14 ++-- .../transport/pipes/PipeLiquidsStone.java | 16 +++-- .../transport/pipes/PipeLiquidsVoid.java | 14 ++-- .../transport/pipes/PipeLiquidsWood.java | 23 ++++--- .../transport/pipes/PipePowerGold.java | 14 ++-- .../transport/pipes/PipePowerStone.java | 14 ++-- .../transport/pipes/PipePowerWood.java | 23 ++++--- .../pipes/PipeStructureCobblestone.java | 20 +++--- .../transport/render/FacadeItemRenderer.java | 6 +- .../transport/render/PipeItemRenderer.java | 18 +++--- .../transport/render/PipeWorldRenderer.java | 41 +++++++----- .../transport/render/RenderPipe.java | 6 +- .../transport/utils/FacadeMatrix.java | 30 +++++---- .../transport/utils/TextureMatrix.java | 14 ++-- .../transport/utils/WireMatrix.java | 21 +++--- 79 files changed, 493 insertions(+), 275 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_13.png => PipeStructureCobblestone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_14.png => pipeAllEmerald_solid.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_3.png => pipeAllIron_solid.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_15.png => pipeAllWood_solid.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_1.png => pipeItemsCobblestone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_5.png => pipeItemsDiamond_center.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_6.png => pipeItemsDiamond_down.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_11.png => pipeItemsDiamond_east.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_8.png => pipeItemsDiamond_north.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_9.png => pipeItemsDiamond_south.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_7.png => pipeItemsDiamond_up.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_10.png => pipeItemsDiamond_west.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_13.png => pipeItemsEmerald_standard.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_14.png => pipeItemsGold.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_2.png => pipeItemsIron_standard.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_12.png => pipeItemsObsidian.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_15.png => pipeItemsSandstone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_13.png => pipeItemsStone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_14.png => pipeItemsVoid.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_1_0.png => pipeItemsWood_standard.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_1.png => pipeLiquidsCobblestone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_15.png => pipeLiquidsEmerald_standard.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_4.png => pipeLiquidsGold.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_3.png => pipeLiquidsIron_standard.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_15.png => pipeLiquidsSandstone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_2.png => pipeLiquidsStone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_14.png => pipeLiquidsVoid.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_0.png => pipeLiquidsWood_standard.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_10.png => pipePowerGold.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_8.png => pipePowerStone.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_6.png => pipePowerWood_standard.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_7.png => texture_blue_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_8.png => texture_blue_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_4.png => texture_cyan.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_9.png => texture_green_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_10.png => texture_green_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_5.png => texture_red_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_6.png => texture_red_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_11.png => texture_yellow_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_0_12.png => texture_yellow_lit.png} (100%) create mode 100644 common/buildcraft/transport/IconConstants.java diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/PipeStructureCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_13.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/PipeStructureCobblestone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllEmerald_solid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_14.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllEmerald_solid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllIron_solid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_3.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllIron_solid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllWood_solid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_15.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllWood_solid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_1.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsCobblestone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_center.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_5.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_center.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_down.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_6.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_down.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_east.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_11.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_east.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_north.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_8.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_north.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_south.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_9.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_south.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_up.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_7.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_up.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_west.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_10.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsDiamond_west.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsEmerald_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_13.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsEmerald_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsGold.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_14.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsGold.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsIron_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_2.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsIron_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsObsidian.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_12.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsObsidian.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsSandstone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_15.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsSandstone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsStone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_13.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsStone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsVoid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_14.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsVoid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_1_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsWood_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_1_0.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsWood_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_1.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsCobblestone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsEmerald_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_15.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsEmerald_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsGold.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_4.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsGold.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsIron_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_3.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsIron_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsSandstone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_15.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsSandstone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsStone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_2.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsStone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsVoid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_14.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsVoid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsWood_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_0.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeLiquidsWood_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerGold.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_10.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerGold.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerStone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_8.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerStone.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerWood_standard.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_6.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipePowerWood_standard.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_7.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_8.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_blue_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_cyan.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_4.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_cyan.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_9.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_10.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_green_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_5.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_6.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_red_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_11.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_0_12.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/texture_yellow_lit.png diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 7584c66c..139b48bc 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -16,6 +16,7 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; @@ -91,14 +92,17 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Mod(version = Version.VERSION, modid = "BuildCraft|Transport", name = "Buildcraft Transport", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandlerTransport.class) public class BuildCraftTransport { public static BlockGenericPipe genericPipeBlock; - public static int[] diamondTextures = new int[6]; - + @SideOnly(Side.CLIENT) + public Icon[] icons; + public static boolean alwaysConnectPipes; public static boolean usePipeLoss; public static int maxItemsInPipes; @@ -357,6 +361,7 @@ public class BuildCraftTransport { // MinecraftForge.setGuiHandler(mod_BuildCraftTransport.instance, new GuiHandler()); TransportProxy.proxy.registerTileEntities(); + TransportProxy.proxy.loadIcons(this); // dockingStationBlock = new // BlockDockingStation(Integer.parseInt(dockingStationId.value)); @@ -367,10 +372,6 @@ public class BuildCraftTransport { // ModLoader.RegisterTileEntity(TileDockingStation.class, // "net.minecraft.src.buildcraft.TileDockingStation"); - for (int j = 0; j < 6; ++j) { - diamondTextures[j] = 1 * 16 + 6 + j; - } - new BptBlockPipe(genericPipeBlock.blockID); BuildCraftCore.itemBptProps[pipeItemsWood.itemID] = new BptItemPipeWooden(); diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 28638638..a955c294 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -797,7 +797,7 @@ public class BlockGenericPipe extends BlockContainer { Pipe dummyPipe = createPipe(item.itemID); if (dummyPipe != null) { - item.setTextureIndex(dummyPipe.getTextureIndexForItem()); + item.setPipeIcon(dummyPipe.getTextureIcons()[dummyPipe.getIconIndexForItem()]); } return item; diff --git a/common/buildcraft/transport/IPipeRenderState.java b/common/buildcraft/transport/IPipeRenderState.java index 1e946e6f..6cbf09fc 100644 --- a/common/buildcraft/transport/IPipeRenderState.java +++ b/common/buildcraft/transport/IPipeRenderState.java @@ -1,5 +1,8 @@ package buildcraft.transport; +import net.minecraft.util.Icon; + public interface IPipeRenderState { public PipeRenderState getRenderState(); + public Icon[] getPipeIcons(); } diff --git a/common/buildcraft/transport/IconConstants.java b/common/buildcraft/transport/IconConstants.java new file mode 100644 index 00000000..fc04a543 --- /dev/null +++ b/common/buildcraft/transport/IconConstants.java @@ -0,0 +1,50 @@ +package buildcraft.transport; + +public class IconConstants { + + public static final int PipeStructureCobblestone = 0; + public static final int PipeItemsCobbleStone = 1; + public static final int PipeItemsDiamond_Center = 2; + public static final int PipeItemsDiamond_Down = 3; + public static final int PipeItemsDiamond_Up = 4; + public static final int PipeItemsDiamond_North = 5; + public static final int PipeItemsDiamond_South = 6; + public static final int PipeItemsDiamond_West = 7; + public static final int PipeItemsDiamond_East = 8; + public static final int PipeItemsWood_Standard = 9; + public static final int PipeAllWood_Solid = 10; + public static final int PipeItemsEmerald_Standard = 11; + public static final int PipeAllEmerald_Solid = 12; + public static final int PipeItemsGold = 13; + public static final int PipeItemsIron_Standard = 14; + public static final int PipeAllIron_Solid = 15; + public static final int PipeItemsObsidian = 16; + public static final int PipeItemsSandstone = 17; + public static final int PipeItemsStone = 18; + public static final int PipeItemsVoid = 19; + public static final int PipeLiquidsCobblestone = 20; + public static final int PipeLiquidsWood_Standard = 21; + public static final int PipeLiquidsEmerald_Standard = 22; + public static final int PipeLiquidsGold = 23; + public static final int PipeLiquidsIron_Standard = 24; + public static final int PipeLiquidsSandstone = 25; + public static final int PipeLiquidsStone = 26; + public static final int PipeLiquidsVoid = 27; + public static final int PipePowerGold = 28; + public static final int PipePowerStone = 29; + public static final int PipePowerWood_Standard = 30; + + public static final int Texture_Red_Dark = 31; + public static final int Texture_Red_Lit = 32; + public static final int Texture_Blue_Dark = 33; + public static final int Texture_Blue_Lit = 34; + public static final int Texture_Green_Dark = 35; + public static final int Texture_Green_Lit = 36; + public static final int Texture_Yellow_Dark = 37; + public static final int Texture_Yellow_Lit = 38; + public static final int Texture_Cyan = 39; + + public static final int MAX = 40; + + +} diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index ed8b93b3..a6ee57ff 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -9,9 +9,12 @@ package buildcraft.transport; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftTransport; import buildcraft.core.CreativeTabBuildCraft; @@ -21,10 +24,6 @@ import buildcraft.BuildCraftCore; public class ItemPipe extends ItemBuildCraft implements IItemPipe { - Pipe dummyPipe; - - private int textureIndex = 0; - protected ItemPipe(int i) { super(i); setCreativeTab(CreativeTabBuildCraft.tabBuildCraft); @@ -85,13 +84,14 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { } else return false; } - - public ItemPipe setTextureIndex(int textureIndex) { - this.textureIndex = textureIndex; - return this; + + @SideOnly(Side.CLIENT) + public Icon getPipeIcon(){ + return iconIndex; } - - public int getTextureIndex() { - return textureIndex; + + @SideOnly(Side.CLIENT) + public void setPipeIcon(Icon icon){ + this.iconIndex = icon; } } diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index f74ea5bb..58ada53a 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -14,6 +14,9 @@ import java.util.LinkedList; import java.util.Map; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -21,6 +24,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; @@ -137,29 +141,33 @@ public abstract class Pipe implements IPipe, IDropControlInventory { return logic.isPipeConnected(tile) && transport.isPipeConnected(tile, side); } - /** - * Should return the texture file that is used to render this pipe - */ - public abstract String getTextureFile(); - - /** - * Should return the textureindex in the file specified by getTextureFile() - * - * @param direction - * The orientation for the texture that is requested. Unknown for the center pipe center - * @return the index in the texture sheet - */ - public abstract int getTextureIndex(ForgeDirection direction); - /** * Should return the textureindex used by the Pipe Item Renderer, as this is done client-side the default implementation might not work if your * getTextureIndex(Orienations.Unknown) has logic * * @return */ - public int getTextureIndexForItem() { - return getTextureIndex(ForgeDirection.UNKNOWN); + public int getIconIndexForItem() { + return getIconIndex(ForgeDirection.UNKNOWN); } + + + /** + * Should return an array of icons that is registered with this pipe. Do not return/modify the buildcraft one! + * @return An array of icons + */ + @SideOnly(Side.CLIENT) + public abstract Icon[] getTextureIcons(); + + /** + * Should return the index in the array returned by GetTextureIcons() for a specified direction + * @param direction - The direction for which the indexed should be rendered. Unknown for pipe center + * + * @return An index valid in the array returned by getTextureIcons() + */ + public abstract int getIconIndex(ForgeDirection direction); + + public void updateEntity() { diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index 7ed6fbc2..f2842252 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -15,7 +15,6 @@ import buildcraft.transport.utils.WireMatrix; public class PipeRenderState implements IClientState { - private String textureFile = DefaultProps.TEXTURE_BLOCKS; private boolean hasGate = false; private int gateTextureIndex = 0; @@ -32,25 +31,6 @@ public class PipeRenderState implements IClientState { */ public Icon currentTexture; - public PipeRenderState() { - // for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS){ - // facadeMatrix.setConnected(direction, true); - // facadeMatrix.setTextureFile(direction, "/terrain.png"); - // facadeMatrix.setTextureIndex(direction, direction.ordinal()); - // } - } - - public void setTextureFile(String textureFile) { - if (this.textureFile != textureFile) { - this.textureFile = textureFile; - this.dirty = true; - } - } - - public String getTextureFile() { - return this.textureFile; - } - public void setHasGate(boolean value) { if (hasGate != value) { hasGate = value; @@ -87,7 +67,6 @@ public class PipeRenderState implements IClientState { @Override public void writeData(DataOutputStream data) throws IOException { - data.writeUTF(textureFile); data.writeBoolean(hasGate); data.writeInt(gateTextureIndex); pipeConnectionMatrix.writeData(data); @@ -98,7 +77,6 @@ public class PipeRenderState implements IClientState { @Override public void readData(DataInputStream data) throws IOException { - textureFile = data.readUTF(); hasGate = data.readBoolean(); gateTextureIndex = data.readInt(); pipeConnectionMatrix.readData(data); @@ -106,5 +84,4 @@ public class PipeRenderState implements IClientState { wireMatrix.readData(data); facadeMatrix.readData(data); } - } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 9c4e0aee..82e26f76 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; @@ -203,9 +204,8 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank } // Pipe Textures - renderState.setTextureFile(pipe.getTextureFile()); for (ForgeDirection o : ForgeDirection.values()) { - renderState.textureMatrix.setTextureIndex(o, pipe.getTextureIndex(o)); + renderState.textureMatrix.setIconIndex(o, pipe.getIconIndex(o)); } // WireState @@ -214,32 +214,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { renderState.wireMatrix.setWireConnected(color, direction, pipe.isWireConnectedTo(this.getTile(direction), color)); } - } - - // Wire Textures - - if (pipe.wireSet[IPipe.WireColor.Red.ordinal()]) { - renderState.wireMatrix.setTextureIndex(WireColor.Red, pipe.signalStrength[IPipe.WireColor.Red.ordinal()] > 0 ? 6 : 5); - } else { - renderState.wireMatrix.setTextureIndex(WireColor.Red, 0); - } - - if (pipe.wireSet[IPipe.WireColor.Blue.ordinal()]) { - renderState.wireMatrix.setTextureIndex(WireColor.Blue, pipe.signalStrength[IPipe.WireColor.Blue.ordinal()] > 0 ? 8 : 7); - } else { - renderState.wireMatrix.setTextureIndex(WireColor.Blue, 0); - } - - if (pipe.wireSet[IPipe.WireColor.Green.ordinal()]) { - renderState.wireMatrix.setTextureIndex(WireColor.Green, pipe.signalStrength[IPipe.WireColor.Green.ordinal()] > 0 ? 10 : 9); - } else { - renderState.wireMatrix.setTextureIndex(WireColor.Green, 0); - } - - if (pipe.wireSet[IPipe.WireColor.Yellow.ordinal()]) { - renderState.wireMatrix.setTextureIndex(WireColor.Yellow, pipe.signalStrength[IPipe.WireColor.Yellow.ordinal()] > 0 ? 12 : 11); - } else { - renderState.wireMatrix.setTextureIndex(WireColor.Yellow, 0); + renderState.wireMatrix.setWireLit(color, pipe.signalStrength[color.ordinal()] > 0); } // Gate Textures @@ -251,9 +226,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank int blockId = this.facadeBlocks[direction.ordinal()]; renderState.facadeMatrix.setConnected(direction, blockId != 0 && Block.blocksList[blockId] != null); if (Block.blocksList[blockId] != null) { - Block block = Block.blocksList[blockId]; - - // TODO + renderState.facadeMatrix.setFacade(direction, blockId, this.facadeMeta[direction.ordinal()]); } } @@ -611,6 +584,12 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank public PipeRenderState getRenderState() { return renderState; } + + @Override + public Icon[] getPipeIcons() { + if (pipe == null) return null; + return pipe.getTextureIcons(); + } @Override public IClientState getStateInstance(byte stateId) { diff --git a/common/buildcraft/transport/TransportProxy.java b/common/buildcraft/transport/TransportProxy.java index 9d3804f4..9fc31c8f 100644 --- a/common/buildcraft/transport/TransportProxy.java +++ b/common/buildcraft/transport/TransportProxy.java @@ -1,5 +1,6 @@ package buildcraft.transport; +import buildcraft.BuildCraftTransport; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.registry.GameRegistry; @@ -17,4 +18,7 @@ public class TransportProxy { public void registerRenderers() { } + public void loadIcons(BuildCraftTransport buildCraftTransport) { + } + } diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index 95f6bf3f..d08fc30d 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -1,5 +1,8 @@ package buildcraft.transport; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.Icon; import net.minecraftforge.client.MinecraftForgeClient; import buildcraft.BuildCraftTransport; import buildcraft.transport.render.FacadeItemRenderer; @@ -57,4 +60,62 @@ public class TransportProxyClient extends TransportProxy { RenderingRegistry.registerBlockHandler(pipeWorldRenderer); } + + @Override + public void loadIcons(BuildCraftTransport instance) { + instance.icons = new Icon[IconConstants.MAX]; + TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.field_94154_l; + instance.icons[IconConstants.PipeStructureCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeStructureCobblestone"); + + instance.icons[IconConstants.PipeItemsCobbleStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsCobblestone"); + + instance.icons[IconConstants.PipeItemsDiamond_Center] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_center"); + instance.icons[IconConstants.PipeItemsDiamond_Down] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_down"); + instance.icons[IconConstants.PipeItemsDiamond_Up] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_up"); + instance.icons[IconConstants.PipeItemsDiamond_North] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_north"); + instance.icons[IconConstants.PipeItemsDiamond_South] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_south"); + instance.icons[IconConstants.PipeItemsDiamond_West] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_west"); + instance.icons[IconConstants.PipeItemsDiamond_East] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_east"); + + instance.icons[IconConstants.PipeItemsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsWood_standard"); + instance.icons[IconConstants.PipeAllWood_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllWood_solid"); + + instance.icons[IconConstants.PipeItemsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsEmerald_standard"); + instance.icons[IconConstants.PipeAllEmerald_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllEmerald_solid"); + + instance.icons[IconConstants.PipeItemsGold] = terrainTextures.func_94245_a("buildcraft:pipeItemsGold"); + + instance.icons[IconConstants.PipeItemsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsIron_standard"); + instance.icons[IconConstants.PipeAllIron_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllIron_solid"); + + instance.icons[IconConstants.PipeItemsObsidian] = terrainTextures.func_94245_a("buildcraft:pipeItemsObsidian"); + instance.icons[IconConstants.PipeItemsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeItemsSandstone"); + instance.icons[IconConstants.PipeItemsStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsStone"); + instance.icons[IconConstants.PipeItemsVoid] = terrainTextures.func_94245_a("buildcraft:pipeItemsVoid"); + + instance.icons[IconConstants.PipeLiquidsCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsCobblestone"); + instance.icons[IconConstants.PipeLiquidsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsWood_standard"); + instance.icons[IconConstants.PipeLiquidsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsEmerald_standard"); + instance.icons[IconConstants.PipeLiquidsGold] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsGold"); + instance.icons[IconConstants.PipeLiquidsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsIron_standard"); + instance.icons[IconConstants.PipeLiquidsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsSandstone"); + instance.icons[IconConstants.PipeLiquidsStone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsStone"); + instance.icons[IconConstants.PipeLiquidsVoid] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsVoid"); + + instance.icons[IconConstants.PipePowerGold] = terrainTextures.func_94245_a("buildcraft:pipePowerGold"); + instance.icons[IconConstants.PipePowerStone] = terrainTextures.func_94245_a("buildcraft:pipePowerStone"); + instance.icons[IconConstants.PipePowerWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipePowerWood_standard"); + + instance.icons[IconConstants.Texture_Red_Dark] = terrainTextures.func_94245_a("buildcraft:texture_red_dark"); + instance.icons[IconConstants.Texture_Red_Lit] = terrainTextures.func_94245_a("buildcraft:texture_red_lit"); + instance.icons[IconConstants.Texture_Blue_Dark] = terrainTextures.func_94245_a("buildcraft:texture_blue_dark"); + instance.icons[IconConstants.Texture_Blue_Lit] = terrainTextures.func_94245_a("buildcraft:texture_blue_lit"); + instance.icons[IconConstants.Texture_Green_Dark] = terrainTextures.func_94245_a("buildcraft:texture_green_dark"); + instance.icons[IconConstants.Texture_Green_Lit] = terrainTextures.func_94245_a("buildcraft:texture_green_lit"); + instance.icons[IconConstants.Texture_Yellow_Dark] = terrainTextures.func_94245_a("buildcraft:texture_yellow_dark"); + instance.icons[IconConstants.Texture_Yellow_Lit] = terrainTextures.func_94245_a("buildcraft:texture_yellow_lit"); + instance.icons[IconConstants.Texture_Cyan] = terrainTextures.func_94245_a("buildcraft:texture_cyan"); + + + } } diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index 9920c1ee..4ed267e7 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -8,8 +8,13 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -21,13 +26,14 @@ public class PipeItemsCobblestone extends Pipe { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 1 * 16 + 1; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeItemsCobbleStone; } } diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index 8cd93894..20b50b70 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -13,10 +13,14 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.LinkedList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; @@ -24,6 +28,7 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.network.IClientState; import buildcraft.transport.IPipeTransportItemsHook; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -34,15 +39,23 @@ public class PipeItemsDiamond extends Pipe implements IPipeTransportItemsHook, I } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - if (direction == ForgeDirection.UNKNOWN) - return 1 * 16 + 5; - return BuildCraftTransport.diamondTextures[direction.ordinal()]; + public int getIconIndex(ForgeDirection direction) { + switch(direction){ + case UNKNOWN: return IconConstants.PipeItemsDiamond_Center; + case DOWN: return IconConstants.PipeItemsDiamond_Down; + case UP: return IconConstants.PipeItemsDiamond_Up; + case NORTH: return IconConstants.PipeItemsDiamond_North; + case SOUTH: return IconConstants.PipeItemsDiamond_South; + case WEST: return IconConstants.PipeItemsDiamond_West; + case EAST: return IconConstants.PipeItemsDiamond_East; + default: throw new IllegalArgumentException("direction out of bounds"); + } } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index 90fc7f30..2c0d29a0 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -22,6 +22,7 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.SimpleInventory; import buildcraft.core.utils.Utils; import buildcraft.transport.BlockGenericPipe; +import buildcraft.transport.IconConstants; import buildcraft.transport.PipeTransportItems; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -39,8 +40,8 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory protected PipeItemsEmerald(int itemID, PipeTransportItems transport) { super(transport, new PipeLogicEmerald(), itemID); - baseTexture = 6 * 16 + 13; - plainTexture = baseTexture + 1; + standardIconIndex = IconConstants.PipeItemsEmerald_Standard; + solidIconIndex = IconConstants.PipeAllEmerald_Solid; } public PipeItemsEmerald(int itemID) { diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index ac5e2286..7949589a 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -10,12 +10,18 @@ package buildcraft.transport.pipes; import java.util.LinkedList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -26,31 +32,16 @@ public class PipeItemsGold extends Pipe implements IPipeTransportItemsHook { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 1 * 16 + 14; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeItemsGold; } - // @Override - // public boolean isPipeConnected(TileEntity tile) { - // if (!super.isPipeConnected(tile)) - // return false; - // - // Pipe pipe2 = null; - // - // if (tile instanceof TileGenericPipe) - // pipe2 = ((TileGenericPipe) tile).pipe; - // - // if (BuildCraftTransport.alwaysConnectPipes) - // return super.isPipeConnected(tile); - // else - // return (pipe2 == null || !(pipe2.logic instanceof PipeLogicGold)) && super.isPipeConnected(tile); - // } - @Override public LinkedList filterPossibleMovements(LinkedList possibleOrientations, Position pos, IPipedItem item) { return possibleOrientations; diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 900988af..d09a99ba 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -8,15 +8,20 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; public class PipeItemsIron extends Pipe { - private int baseTexture = 1 * 16 + 2; - private int plainTexture = 1 * 16 + 3; + private int standardIconIndex = IconConstants.PipeItemsIron_Standard; + private int solidIconIndex = IconConstants.PipeAllIron_Solid; public PipeItemsIron(int itemID) { super(new PipeTransportItems(), new PipeLogicIron(), itemID); @@ -25,21 +30,22 @@ public class PipeItemsIron extends Pipe { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { + public int getIconIndex(ForgeDirection direction) { if (direction == ForgeDirection.UNKNOWN) - return baseTexture; + return standardIconIndex; else { int metadata = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); if (metadata == direction.ordinal()) - return baseTexture; + return solidIconIndex; else - return plainTexture; + return standardIconIndex; } } diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index 57d08b48..343eb6b4 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -10,6 +10,9 @@ package buildcraft.transport.pipes; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityMinecart; @@ -19,7 +22,9 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; @@ -29,6 +34,7 @@ import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -54,13 +60,14 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 1 * 16 + 12; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeItemsObsidian; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index 9069a39a..7a366d58 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -9,8 +9,13 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -20,12 +25,13 @@ public class PipeItemsSandstone extends Pipe { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 8 * 16 + 15; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeItemsSandstone; } } diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index 1f809a7d..5c3c9c1c 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -10,12 +10,18 @@ package buildcraft.transport.pipes; import java.util.LinkedList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -27,13 +33,14 @@ public class PipeItemsStone extends Pipe implements IPipeTransportItemsHook { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 1 * 16 + 13; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeItemsStone; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index 17666cca..f1b543df 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -9,11 +9,16 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.transport.EntityData; import buildcraft.transport.IItemTravelingHook; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -25,13 +30,14 @@ public class PipeItemsVoid extends Pipe implements IItemTravelingHook { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 8 * 16 + 14; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeItemsVoid; } // This is called if the void pipe is only connected to one pipe diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 7e922347..6a17fa3b 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -8,12 +8,16 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; +import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.inventory.ISpecialInventory; import buildcraft.api.power.IPowerProvider; @@ -25,15 +29,16 @@ import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.utils.Utils; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; public class PipeItemsWood extends Pipe implements IPowerReceptor { private IPowerProvider powerProvider; - - protected int baseTexture = 1 * 16 + 0; - protected int plainTexture = 1 * 16 + 15; + + protected int standardIconIndex = IconConstants.PipeItemsWood_Standard; + protected int solidIconIndex = IconConstants.PipeAllWood_Solid; protected PipeItemsWood(PipeTransportItems transport, PipeLogic logic, int itemID) { super(transport, logic, itemID); @@ -52,21 +57,22 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { + public int getIconIndex(ForgeDirection direction) { if (direction == ForgeDirection.UNKNOWN) - return baseTexture; + return standardIconIndex; else { int metadata = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); if (metadata == direction.ordinal()) - return plainTexture; + return solidIconIndex; else - return baseTexture; + return standardIconIndex; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java index de31a062..e92b3372 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java @@ -8,8 +8,13 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -20,12 +25,13 @@ public class PipeLiquidsCobblestone extends Pipe { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 7 * 16 + 1; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeLiquidsCobblestone; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java index e2adf2b7..fe365a44 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java @@ -8,6 +8,7 @@ */ package buildcraft.transport.pipes; +import buildcraft.transport.IconConstants; import buildcraft.transport.PipeTransportLiquids; /** @@ -19,8 +20,8 @@ public class PipeLiquidsEmerald extends PipeLiquidsWood { public PipeLiquidsEmerald(int itemID) { super(new PipeLogicEmerald(), itemID); - baseTexture = 6 * 16 + 15; - plainTexture = baseTexture - 1; + standardIconIndex = IconConstants.PipeLiquidsEmerald_Standard; + solidIconIndex = IconConstants.PipeAllEmerald_Solid; ((PipeTransportLiquids) transport).flowRate = 40; ((PipeTransportLiquids) transport).travelDelay = 4; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsGold.java b/common/buildcraft/transport/pipes/PipeLiquidsGold.java index f44ae998..404468fc 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsGold.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsGold.java @@ -8,8 +8,13 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -23,13 +28,14 @@ public class PipeLiquidsGold extends Pipe { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 7 * 16 + 4; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeLiquidsGold; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsIron.java b/common/buildcraft/transport/pipes/PipeLiquidsIron.java index 95bde61c..e049a259 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsIron.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsIron.java @@ -8,36 +8,43 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; public class PipeLiquidsIron extends Pipe { + + protected int standardIconIndex = IconConstants.PipeLiquidsIron_Standard; + protected int solidIconIndex = IconConstants.PipeAllIron_Solid; - private int baseTexture = 7 * 16 + 3; - private int plainTexture = 1 * 16 + 3; public PipeLiquidsIron(int itemID) { super(new PipeTransportLiquids(), new PipeLogicIron(), itemID); } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { + public int getIconIndex(ForgeDirection direction) { if (direction == ForgeDirection.UNKNOWN) - return baseTexture; + return standardIconIndex; else { int metadata = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); if (metadata == direction.ordinal()) - return baseTexture; + return solidIconIndex; else - return plainTexture; + return standardIconIndex; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java index 33c18a86..02f62cd4 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -9,10 +9,15 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.transport.IPipeTransportLiquidsHook; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.TileGenericPipe; @@ -23,13 +28,14 @@ public class PipeLiquidsSandstone extends Pipe implements IPipeTransportLiquidsH } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 9 * 16 + 15; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeLiquidsSandstone; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsStone.java b/common/buildcraft/transport/pipes/PipeLiquidsStone.java index fc5b9b55..fb155f21 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsStone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsStone.java @@ -8,8 +8,13 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -20,15 +25,16 @@ public class PipeLiquidsStone extends Pipe { // ((PipeTransportLiquids) transport).flowRate = 40; } - + @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 7 * 16 + 2; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeLiquidsStone; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java index 3a6aac22..e684756c 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java @@ -9,10 +9,15 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.transport.IPipeTransportLiquidsHook; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -23,13 +28,14 @@ public class PipeLiquidsVoid extends Pipe implements IPipeTransportLiquidsHook { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 9 * 16 + 14; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeLiquidsVoid; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index 6ceb5ab9..bf2731ea 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -8,12 +8,16 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; +import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; @@ -22,6 +26,7 @@ import buildcraft.api.transport.PipeManager; import buildcraft.core.DefaultProps; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.network.TileNetworkData; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -31,8 +36,9 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { int liquidToExtract; private IPowerProvider powerProvider; - protected int baseTexture = 7 * 16 + 0; - protected int plainTexture = 1 * 16 + 15; + + protected int standardIconIndex = IconConstants.PipeLiquidsWood_Standard; + protected int solidIconIndex = IconConstants.PipeAllWood_Solid; long lastMining = 0; boolean lastPower = false; @@ -120,21 +126,22 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { + public int getIconIndex(ForgeDirection direction) { if (direction == ForgeDirection.UNKNOWN) - return baseTexture; + return standardIconIndex; else { int metadata = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); if (metadata == direction.ordinal()) - return plainTexture; + return solidIconIndex; else - return baseTexture; + return standardIconIndex; } } diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index 8e6c5481..f991b10d 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -8,8 +8,13 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportPower; @@ -22,13 +27,14 @@ public class PipePowerGold extends Pipe { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 7 * 16 + 10; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipePowerGold; } } diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index a32be911..c0f77728 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -8,8 +8,13 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportPower; @@ -20,13 +25,14 @@ public class PipePowerStone extends Pipe { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { - return 7 * 16 + 8; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipePowerStone; } } diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 98174748..830fad56 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -8,13 +8,18 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.TileGenericPipe; @@ -24,9 +29,10 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { private static final int MAX_OVERHEAT_TICKS = 100; private IPowerProvider powerProvider; + + protected int standardIconIndex = IconConstants.PipePowerWood_Standard; + protected int solidIconIndex = IconConstants.PipeAllWood_Solid; - private int baseTexture = 7 * 16 + 6; - private int plainTexture = 1 * 16 + 15; private int overheatTicks; @@ -39,21 +45,22 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { } @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } @Override - public int getTextureIndex(ForgeDirection direction) { + public int getIconIndex(ForgeDirection direction) { if (direction == ForgeDirection.UNKNOWN) - return baseTexture; + return standardIconIndex; else { int metadata = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); if (metadata == direction.ordinal()) - return plainTexture; + return solidIconIndex; else - return baseTexture; + return standardIconIndex; } } diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index 674fff88..96d4eea1 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -1,7 +1,12 @@ package buildcraft.transport.pipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportStructure; @@ -9,17 +14,16 @@ public class PipeStructureCobblestone extends Pipe { public PipeStructureCobblestone(int itemID) { super(new PipeTransportStructure(), new PipeLogicCobblestone(), itemID); - } - + @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; + @SideOnly(Side.CLIENT) + public Icon[] getTextureIcons() { + return BuildCraftTransport.instance.icons; } - + @Override - public int getTextureIndex(ForgeDirection direction) { - return 7 * 16 + 13; + public int getIconIndex(ForgeDirection direction) { + return IconConstants.PipeStructureCobblestone; } - } diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index ff99ba6b..10a432e9 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; @@ -12,7 +13,9 @@ import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import buildcraft.transport.IconConstants; import buildcraft.transport.ItemFacade; +import buildcraft.transport.pipes.PipeStructureCobblestone; public class FacadeItemRenderer implements IItemRenderer { @@ -62,7 +65,8 @@ public class FacadeItemRenderer implements IItemRenderer { // Render StructurePipe block = BuildCraftTransport.genericPipeBlock; - int textureID = 7 * 16 + 13; // Structure pipe + Icon textureID = BuildCraftTransport.instance.icons[IconConstants.PipeStructureCobblestone]; // Structure pipe + block.setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos - 1F / 16F); block.setBlockBoundsForItemRender(); render.setRenderBoundsFromBlock(block); diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index 8c0735e0..b1aaf503 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -5,6 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; @@ -21,10 +22,7 @@ public class PipeItemRenderer implements IItemRenderer { Tessellator tessellator = Tessellator.instance; Block block = BuildCraftTransport.genericPipeBlock; - int textureID = ((ItemPipe) Item.itemsList[item.itemID]).getTextureIndex(); - if (textureID > 255) { - textureID -= 256; - } + Icon icon = ((ItemPipe) Item.itemsList[item.itemID]).getPipeIcon(); block.setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); block.setBlockBoundsForItemRender(); @@ -33,27 +31,27 @@ public class PipeItemRenderer implements IItemRenderer { GL11.glTranslatef(translateX, translateY, translateZ); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - render.renderBottomFace(block, 0.0D, 0.0D, 0.0D, textureID); + render.renderBottomFace(block, 0.0D, 0.0D, 0.0D, icon); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - render.renderTopFace(block, 0.0D, 0.0D, 0.0D, textureID); + render.renderTopFace(block, 0.0D, 0.0D, 0.0D, icon); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - render.renderEastFace(block, 0.0D, 0.0D, 0.0D, textureID); + render.renderEastFace(block, 0.0D, 0.0D, 0.0D, icon); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - render.renderWestFace(block, 0.0D, 0.0D, 0.0D, textureID); + render.renderWestFace(block, 0.0D, 0.0D, 0.0D, icon); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - render.renderNorthFace(block, 0.0D, 0.0D, 0.0D, textureID); + render.renderNorthFace(block, 0.0D, 0.0D, 0.0D, icon); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - render.renderSouthFace(block, 0.0D, 0.0D, 0.0D, textureID); + render.renderSouthFace(block, 0.0D, 0.0D, 0.0D, icon); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index a723f0ec..1ca39370 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -3,16 +3,19 @@ package buildcraft.transport.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.ForgeDirection; +import buildcraft.BuildCraftTransport; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe.WireColor; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeRenderState; +import buildcraft.transport.IconConstants; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TransportProxy; +import buildcraft.transport.pipes.PipeStructureCobblestone; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { @@ -76,53 +79,58 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { return target; } - public void renderPipe(RenderBlocks renderblocks, IBlockAccess iblockaccess, Block block, PipeRenderState state, int x, int y, int z) { + public void renderPipe(RenderBlocks renderblocks, IBlockAccess iblockaccess, Block block, IPipeRenderState renderState, int x, int y, int z) { float minSize = Utils.pipeMinPos; float maxSize = Utils.pipeMaxPos; + + PipeRenderState state = renderState.getRenderState(); + Icon[] icons = renderState.getPipeIcons(); + if (icons == null) return; + - state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.UNKNOWN); + state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.UNKNOWN)]; block.setBlockBounds(minSize, minSize, minSize, maxSize, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); if (state.pipeConnectionMatrix.isConnected(ForgeDirection.WEST)) { - state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.WEST); + state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.WEST)]; block.setBlockBounds(0.0F, minSize, minSize, minSize, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.EAST)) { - state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.EAST); + state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.EAST)]; block.setBlockBounds(maxSize, minSize, minSize, 1.0F, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.DOWN)) { - state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.DOWN); + state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.DOWN)]; block.setBlockBounds(minSize, 0.0F, minSize, maxSize, minSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.UP)) { - state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.UP); + state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.UP)]; block.setBlockBounds(minSize, maxSize, minSize, maxSize, 1.0F, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.NORTH)) { - state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.NORTH); + state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.NORTH)]; block.setBlockBounds(minSize, minSize, 0.0F, maxSize, maxSize, minSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.SOUTH)) { - state.currentTexture = state.textureMatrix.getTextureIndex(ForgeDirection.SOUTH); + state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.SOUTH)]; block.setBlockBounds(minSize, minSize, maxSize, maxSize, maxSize, 1.0F); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); @@ -131,22 +139,22 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); if (state.wireMatrix.hasWire(WireColor.Red)) { - state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Red); + state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Red)?IconConstants.Texture_Red_Lit:IconConstants.Texture_Red_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMinPos, IPipe.WireColor.Red, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Blue)) { - state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Blue); + state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Blue)?IconConstants.Texture_Blue_Lit:IconConstants.Texture_Blue_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos, IPipe.WireColor.Blue, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Green)) { - state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Green); + state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Green)?IconConstants.Texture_Green_Lit:IconConstants.Texture_Green_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMinPos, Utils.pipeMinPos, IPipe.WireColor.Green, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Yellow)) { - state.currentTexture = state.wireMatrix.getTextureIndex(WireColor.Yellow); + state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Yellow)?IconConstants.Texture_Yellow_Lit:IconConstants.Texture_Yellow_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, IPipe.WireColor.Yellow, x, y, z); } @@ -175,8 +183,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if (state.facadeMatrix.isConnected(direction)) { - ForgeHooksClient.bindTexture(state.facadeMatrix.getTextureFile(direction), 0); - state.currentTexture = state.facadeMatrix.getTextureIcon(direction); + state.currentTexture = Block.blocksList[state.facadeMatrix.getFacadeBlockId(direction)].getBlockTextureFromSideAndMetadata(direction.ordinal(), state.facadeMatrix.getFacadeMetaId(direction)); // Hollow facade if (state.pipeConnectionMatrix.isConnected(direction)) { @@ -234,7 +241,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { zeroState[2][0] = Utils.pipeMinPos; zeroState[2][1] = Utils.pipeMaxPos; - state.currentTexture = 7 * 16 + 13; // Structure Pipe + state.currentTexture = BuildCraftTransport.instance.icons[IconConstants.PipeStructureCobblestone]; // Structure Pipe for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if (state.facadeMatrix.isConnected(direction) && !state.pipeConnectionMatrix.isConnected(direction)) { @@ -523,7 +530,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { if (tile instanceof IPipeRenderState) { IPipeRenderState pipeTile = (IPipeRenderState) tile; - renderPipe(renderer, world, block, pipeTile.getRenderState(), x, y, z); + renderPipe(renderer, world, block, pipeTile, x, y, z); } return true; } diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index 5cacf0da..1dc97d83 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -28,6 +28,7 @@ import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftCore.RenderMode; import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; @@ -35,6 +36,7 @@ import buildcraft.core.render.RenderEntityBlock; import buildcraft.core.render.RenderEntityBlock.BlockInterface; import buildcraft.core.utils.Utils; import buildcraft.transport.EntityData; +import buildcraft.transport.IconConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; @@ -193,7 +195,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { initialized = true; BlockInterface block = new BlockInterface(); - block.texture = 4; + block.texture = BuildCraftTransport.instance.icons[IconConstants.Texture_Cyan]; float size = Utils.pipeMaxPos - Utils.pipeMinPos; @@ -219,7 +221,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glEndList(); } - block.texture = 6; + block.texture = BuildCraftTransport.instance.icons[IconConstants.Texture_Red_Dark]; size = Utils.pipeMaxPos - Utils.pipeMinPos; diff --git a/common/buildcraft/transport/utils/FacadeMatrix.java b/common/buildcraft/transport/utils/FacadeMatrix.java index fcfea0cf..d247f1ae 100644 --- a/common/buildcraft/transport/utils/FacadeMatrix.java +++ b/common/buildcraft/transport/utils/FacadeMatrix.java @@ -8,24 +8,29 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; public class FacadeMatrix extends ConnectionMatrix { - private Icon[] _textureIcons = new Icon[ForgeDirection.VALID_DIRECTIONS.length]; + private final int[] _blockIds = new int[ForgeDirection.VALID_DIRECTIONS.length]; + private final int[] _blockMetas = new int[ForgeDirection.VALID_DIRECTIONS.length]; private boolean dirty = false; public FacadeMatrix() { } - - public Icon getTextureIcon(ForgeDirection direction) { - return _textureIcons[direction.ordinal()]; - } - - public void setTextureIcon(ForgeDirection direction, Icon value) { - if (_textureIcons[direction.ordinal()] != value) { - _textureIcons[direction.ordinal()] = value; + public void setFacade(ForgeDirection direction, int blockId, int blockMeta){ + if (_blockIds[direction.ordinal()] != blockId || _blockMetas[direction.ordinal()] != blockMeta){ + _blockIds[direction.ordinal()] = blockId; + _blockMetas[direction.ordinal()] = blockMeta; dirty = true; } } + + public int getFacadeBlockId(ForgeDirection direction){ + return _blockIds[direction.ordinal()]; + } + + public int getFacadeMetaId(ForgeDirection direction){ + return _blockMetas[direction.ordinal()]; + } @Override public boolean isDirty() { @@ -42,7 +47,8 @@ public class FacadeMatrix extends ConnectionMatrix { public void readData(DataInputStream data) throws IOException { super.readData(data); for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) { - _textureIcons[i] = data.readInt(); + _blockIds[i] = data.readInt(); + _blockMetas[i] = data.readInt(); } } @@ -50,8 +56,8 @@ public class FacadeMatrix extends ConnectionMatrix { public void writeData(DataOutputStream data) throws IOException { super.writeData(data); for (int i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) { - data.writeUTF(_textureFiles[i]); - data.writeInt(_textureIcons[i]); + data.writeInt(_blockIds[i]); + data.writeInt(_blockMetas[i]); } } } diff --git a/common/buildcraft/transport/utils/TextureMatrix.java b/common/buildcraft/transport/utils/TextureMatrix.java index 9dd4d9dd..7f1b79d1 100644 --- a/common/buildcraft/transport/utils/TextureMatrix.java +++ b/common/buildcraft/transport/utils/TextureMatrix.java @@ -8,17 +8,17 @@ import net.minecraftforge.common.ForgeDirection; public class TextureMatrix { - private final int[] _textureIndexes = new int[ForgeDirection.values().length]; + private final int[] _iconIndexes = new int[ForgeDirection.values().length]; private boolean dirty = false; public int getTextureIndex(ForgeDirection direction) { - return _textureIndexes[direction.ordinal()]; + return _iconIndexes[direction.ordinal()]; } - public void setTextureIndex(ForgeDirection direction, int value) { - if (_textureIndexes[direction.ordinal()] != value) { - _textureIndexes[direction.ordinal()] = value; + public void setIconIndex(ForgeDirection direction, int value) { + if (_iconIndexes[direction.ordinal()] != value) { + _iconIndexes[direction.ordinal()] = value; dirty = true; } } @@ -33,13 +33,13 @@ public class TextureMatrix { public void writeData(DataOutputStream data) throws IOException { for (int i = 0; i < ForgeDirection.values().length; i++) { - data.writeInt(_textureIndexes[i]); + data.writeInt(_iconIndexes[i]); } } public void readData(DataInputStream data) throws IOException { for (int i = 0; i < ForgeDirection.values().length; i++) { - _textureIndexes[i] = data.readInt(); + _iconIndexes[i] = data.readInt(); } } } diff --git a/common/buildcraft/transport/utils/WireMatrix.java b/common/buildcraft/transport/utils/WireMatrix.java index 39a54519..fc3f24e7 100644 --- a/common/buildcraft/transport/utils/WireMatrix.java +++ b/common/buildcraft/transport/utils/WireMatrix.java @@ -10,8 +10,9 @@ import buildcraft.api.transport.IPipe; public class WireMatrix { private final boolean[] _hasWire = new boolean[IPipe.WireColor.values().length]; + private final boolean[] _wireLit = new boolean[IPipe.WireColor.values().length]; private final ConnectionMatrix _wires[] = new ConnectionMatrix[IPipe.WireColor.values().length]; - private int _wireTextureIndex[] = new int[IPipe.WireColor.values().length]; + private boolean dirty = false; public WireMatrix() { @@ -38,14 +39,14 @@ public class WireMatrix { public void setWireConnected(IPipe.WireColor color, ForgeDirection direction, boolean value) { _wires[color.ordinal()].setConnected(direction, value); } - - public int getTextureIndex(IPipe.WireColor color) { - return _wireTextureIndex[color.ordinal()]; + + public boolean isWireLit(IPipe.WireColor color){ + return _wireLit[color.ordinal()]; } - - public void setTextureIndex(IPipe.WireColor color, int value) { - if (_wireTextureIndex[color.ordinal()] != value) { - _wireTextureIndex[color.ordinal()] = value; + + public void setWireLit(IPipe.WireColor color, boolean value){ + if (_wireLit[color.ordinal()] != value) { + _wireLit[color.ordinal()] = value; dirty = true; } } @@ -72,7 +73,7 @@ public class WireMatrix { for (int i = 0; i < IPipe.WireColor.values().length; i++) { data.writeBoolean(_hasWire[i]); _wires[i].writeData(data); - data.writeInt(_wireTextureIndex[i]); + data.writeBoolean(_wireLit[i]); } } @@ -80,7 +81,7 @@ public class WireMatrix { for (int i = 0; i < IPipe.WireColor.values().length; i++) { _hasWire[i] = data.readBoolean(); _wires[i].readData(data); - _wireTextureIndex[i] = data.readInt(); + _wireLit[i] = data.readBoolean(); } } } From 9cdd23f03de0b235f0c8e29143b6dac3b5493728 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 9 Mar 2013 14:46:03 +0100 Subject: [PATCH 04/93] Migrated gates Minor renaming --- ...block_9_12.png => gate_autarchic_dark.png} | Bin ...ng => gate_autarchic_diamond_and_dark.png} | Bin ...png => gate_autarchic_diamond_and_lit.png} | Bin ...png => gate_autarchic_diamond_or_dark.png} | Bin ....png => gate_autarchic_diamond_or_lit.png} | Bin ...4.png => gate_autarchic_gold_and_dark.png} | Bin ..._5.png => gate_autarchic_gold_and_lit.png} | Bin ..._6.png => gate_autarchic_gold_or_dark.png} | Bin ...9_7.png => gate_autarchic_gold_or_lit.png} | Bin ...0.png => gate_autarchic_iron_and_dark.png} | Bin ..._1.png => gate_autarchic_iron_and_lit.png} | Bin ..._2.png => gate_autarchic_iron_or_dark.png} | Bin ...9_3.png => gate_autarchic_iron_or_lit.png} | Bin ...{block_9_13.png => gate_autarchic_lit.png} | Bin .../blocks/{block_8_12.png => gate_dark.png} | Bin ...lock_8_8.png => gate_diamond_and_dark.png} | Bin ...block_8_9.png => gate_diamond_and_lit.png} | Bin ...lock_8_10.png => gate_diamond_or_dark.png} | Bin ...block_8_11.png => gate_diamond_or_lit.png} | Bin .../{block_8_4.png => gate_gold_and_dark.png} | Bin .../{block_8_5.png => gate_gold_and_lit.png} | Bin .../{block_8_6.png => gate_gold_or_dark.png} | Bin .../{block_8_7.png => gate_gold_or_lit.png} | Bin .../{block_6_7.png => gate_iron_and_dark.png} | Bin .../{block_6_8.png => gate_iron_and_lit.png} | Bin .../{block_6_9.png => gate_iron_or_dark.png} | Bin .../{block_6_10.png => gate_iron_or_lit.png} | Bin .../blocks/{block_8_13.png => gate_lit.png} | Bin .../{block_3_6.png => autarchic_gate.png} | Bin ..._11.png => autarchic_gate_diamond_and.png} | Bin ...3_12.png => autarchic_gate_diamond_or.png} | Bin ...ck_3_9.png => autarchic_gate_gold_and.png} | Bin ...ck_3_10.png => autarchic_gate_gold_or.png} | Bin ...ck_3_7.png => autarchic_gate_iron_and.png} | Bin ...ock_3_8.png => autarchic_gate_iron_or.png} | Bin .../items/{block_2_6.png => gate.png} | Bin .../{block_2_11.png => gate_diamond_and.png} | Bin .../{block_2_12.png => gate_diamond_or.png} | Bin .../{block_2_9.png => gate_gold_and.png} | Bin .../{block_2_10.png => gate_gold_or.png} | Bin .../{block_2_7.png => gate_iron_and.png} | Bin .../items/{block_2_8.png => gate_iron_or.png} | Bin common/buildcraft/transport/GateVanilla.java | 84 ++++------- .../transport/IconItemConstants.java | 23 +++ ...nstants.java => IconTerrainConstants.java} | 36 ++++- common/buildcraft/transport/ItemGate.java | 57 +++++--- .../buildcraft/transport/PipeRenderState.java | 16 +-- .../buildcraft/transport/TileGenericPipe.java | 2 +- .../buildcraft/transport/TransportProxy.java | 6 +- .../transport/TransportProxyClient.java | 136 ++++++++++++------ .../transport/pipes/PipeItemsCobblestone.java | 6 +- .../transport/pipes/PipeItemsDiamond.java | 18 +-- .../transport/pipes/PipeItemsEmerald.java | 6 +- .../transport/pipes/PipeItemsGold.java | 6 +- .../transport/pipes/PipeItemsIron.java | 8 +- .../transport/pipes/PipeItemsObsidian.java | 6 +- .../transport/pipes/PipeItemsSandstone.java | 6 +- .../transport/pipes/PipeItemsStone.java | 6 +- .../transport/pipes/PipeItemsVoid.java | 6 +- .../transport/pipes/PipeItemsWood.java | 8 +- .../pipes/PipeLiquidsCobblestone.java | 6 +- .../transport/pipes/PipeLiquidsEmerald.java | 6 +- .../transport/pipes/PipeLiquidsGold.java | 6 +- .../transport/pipes/PipeLiquidsIron.java | 8 +- .../transport/pipes/PipeLiquidsSandstone.java | 6 +- .../transport/pipes/PipeLiquidsStone.java | 6 +- .../transport/pipes/PipeLiquidsVoid.java | 6 +- .../transport/pipes/PipeLiquidsWood.java | 8 +- .../transport/pipes/PipePowerGold.java | 6 +- .../transport/pipes/PipePowerStone.java | 6 +- .../transport/pipes/PipePowerWood.java | 8 +- .../pipes/PipeStructureCobblestone.java | 6 +- .../transport/render/FacadeItemRenderer.java | 4 +- .../transport/render/PipeWorldRenderer.java | 14 +- .../transport/render/RenderPipe.java | 6 +- 75 files changed, 319 insertions(+), 219 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_12.png => gate_autarchic_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_8.png => gate_autarchic_diamond_and_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_9.png => gate_autarchic_diamond_and_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_10.png => gate_autarchic_diamond_or_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_11.png => gate_autarchic_diamond_or_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_4.png => gate_autarchic_gold_and_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_5.png => gate_autarchic_gold_and_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_6.png => gate_autarchic_gold_or_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_7.png => gate_autarchic_gold_or_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_0.png => gate_autarchic_iron_and_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_1.png => gate_autarchic_iron_and_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_2.png => gate_autarchic_iron_or_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_3.png => gate_autarchic_iron_or_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_9_13.png => gate_autarchic_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_12.png => gate_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_8.png => gate_diamond_and_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_9.png => gate_diamond_and_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_10.png => gate_diamond_or_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_11.png => gate_diamond_or_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_4.png => gate_gold_and_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_5.png => gate_gold_and_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_6.png => gate_gold_or_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_7.png => gate_gold_or_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_7.png => gate_iron_and_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_8.png => gate_iron_and_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_9.png => gate_iron_or_dark.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_10.png => gate_iron_or_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_8_13.png => gate_lit.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_3_6.png => autarchic_gate.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_3_11.png => autarchic_gate_diamond_and.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_3_12.png => autarchic_gate_diamond_or.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_3_9.png => autarchic_gate_gold_and.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_3_10.png => autarchic_gate_gold_or.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_3_7.png => autarchic_gate_iron_and.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_3_8.png => autarchic_gate_iron_or.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_2_6.png => gate.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_2_11.png => gate_diamond_and.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_2_12.png => gate_diamond_or.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_2_9.png => gate_gold_and.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_2_10.png => gate_gold_or.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_2_7.png => gate_iron_and.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_2_8.png => gate_iron_or.png} (100%) create mode 100644 common/buildcraft/transport/IconItemConstants.java rename common/buildcraft/transport/{IconConstants.java => IconTerrainConstants.java} (56%) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_12.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_8.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_9.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_10.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_11.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_diamond_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_4.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_5.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_6.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_7.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_gold_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_0.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_1.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_2.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_3.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_iron_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_9_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_9_13.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_autarchic_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_12.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_8.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_9.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_10.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_11.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_diamond_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_4.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_5.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_6.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_7.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_gold_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_7.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_8.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_and_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_dark.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_9.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_dark.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_10.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_iron_or_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_8_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/gate_lit.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_8_13.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/gate_lit.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_6.png b/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_3_6.png rename to buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_11.png b/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_3_11.png rename to buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_12.png b/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_3_12.png rename to buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_diamond_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_9.png b/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_3_9.png rename to buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_10.png b/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_3_10.png rename to buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_gold_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_7.png b/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_3_7.png rename to buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_8.png b/buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_3_8.png rename to buildcraft_resources/mods/buildcraft/textures/items/autarchic_gate_iron_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_6.png b/buildcraft_resources/mods/buildcraft/textures/items/gate.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_2_6.png rename to buildcraft_resources/mods/buildcraft/textures/items/gate.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_11.png b/buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_2_11.png rename to buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_12.png b/buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_2_12.png rename to buildcraft_resources/mods/buildcraft/textures/items/gate_diamond_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_9.png b/buildcraft_resources/mods/buildcraft/textures/items/gate_gold_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_2_9.png rename to buildcraft_resources/mods/buildcraft/textures/items/gate_gold_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_10.png b/buildcraft_resources/mods/buildcraft/textures/items/gate_gold_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_2_10.png rename to buildcraft_resources/mods/buildcraft/textures/items/gate_gold_or.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_7.png b/buildcraft_resources/mods/buildcraft/textures/items/gate_iron_and.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_2_7.png rename to buildcraft_resources/mods/buildcraft/textures/items/gate_iron_and.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_8.png b/buildcraft_resources/mods/buildcraft/textures/items/gate_iron_or.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_2_8.png rename to buildcraft_resources/mods/buildcraft/textures/items/gate_iron_or.png diff --git a/common/buildcraft/transport/GateVanilla.java b/common/buildcraft/transport/GateVanilla.java index 4d2e4851..253a4384 100644 --- a/common/buildcraft/transport/GateVanilla.java +++ b/common/buildcraft/transport/GateVanilla.java @@ -250,76 +250,42 @@ public class GateVanilla extends Gate { } - // / TEXTURES + // / ICONS @Override - public final int getTexture(boolean isSignalActive) { + public final int getTextureIconIndex(boolean isSignalActive) { boolean isGateActive = isSignalActive; if (hasPulser() && pulser.isActive()) { isGateActive = true; } - - int n = getTextureRow(); - switch (kind) { - case None: - break; - case Single: - if (!isGateActive) - return n * 16 + 12; - else - return n * 16 + 13; - case AND_2: - if (!isGateActive) { - if (hasPulser()) - return 9 * 16 + 0; - else - return 6 * 16 + 7; - } else if (hasPulser()) - return 9 * 16 + 1; - else - return 6 * 16 + 8; - case OR_2: - if (!isGateActive) { - if (hasPulser()) - return 9 * 16 + 2; - else - return 6 * 16 + 9; - } else if (hasPulser()) - return 9 * 16 + 3; - else - return 6 * 16 + 10; - case AND_3: - if (!isGateActive) - return n * 16 + 4; - else - return n * 16 + 5; - case OR_3: - if (!isGateActive) - return n * 16 + 6; - else - return n * 16 + 7; - case AND_4: - if (!isGateActive) - return n * 16 + 8; - else - return n * 16 + 9; - case OR_4: - if (!isGateActive) - return n * 16 + 10; - else - return n * 16 + 11; + + if (!hasPulser()){ + switch (kind){ + case None: return 0; + case Single: return isGateActive ? IconTerrainConstants.Gate_Dark : IconTerrainConstants.Gate_Lit; + case AND_2: return isGateActive ? IconTerrainConstants.Gate_Iron_And_Dark : IconTerrainConstants.Gate_Iron_And_Lit; + case OR_2: return isGateActive ? IconTerrainConstants.Gate_Iron_Or_Dark : IconTerrainConstants.Gate_Iron_Or_Lit; + case AND_3: return isGateActive ? IconTerrainConstants.Gate_Gold_And_Dark : IconTerrainConstants.Gate_Gold_And_Lit; + case OR_3: return isGateActive ? IconTerrainConstants.Gate_Gold_Or_Dark : IconTerrainConstants.Gate_Gold_Or_Lit; + case AND_4: return isGateActive ? IconTerrainConstants.Gate_Diamond_And_Dark : IconTerrainConstants.Gate_Diamond_And_Lit; + case OR_4: return isGateActive ? IconTerrainConstants.Gate_Diamond_Or_Dark : IconTerrainConstants.Gate_Diamond_Or_Lit; + } + } else { + switch (kind){ + case None: return 0; + case Single: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Dark : IconTerrainConstants.Gate_Autarchic_Lit; + case AND_2: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Iron_And_Dark : IconTerrainConstants.Gate_Autarchic_Iron_And_Lit; + case OR_2: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Iron_Or_Dark : IconTerrainConstants.Gate_Autarchic_Iron_Or_Lit; + case AND_3: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Gold_And_Dark : IconTerrainConstants.Gate_Autarchic_Gold_And_Lit; + case OR_3: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Gold_Or_Dark : IconTerrainConstants.Gate_Autarchic_Gold_Or_Lit; + case AND_4: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Diamond_And_Dark : IconTerrainConstants.Gate_Autarchic_Diamond_And_Lit; + case OR_4: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Diamond_Or_Dark : IconTerrainConstants.Gate_Autarchic_Diamond_Or_Lit; + } } return 0; } - private int getTextureRow() { - if (hasPulser()) - return 9; - else - return 8; - } - @Override public String getGuiFile() { if (kind == GateKind.Single) diff --git a/common/buildcraft/transport/IconItemConstants.java b/common/buildcraft/transport/IconItemConstants.java new file mode 100644 index 00000000..1a14cd8f --- /dev/null +++ b/common/buildcraft/transport/IconItemConstants.java @@ -0,0 +1,23 @@ +package buildcraft.transport; + +public class IconItemConstants { + + public static final int Gate = 0; + public static final int Gate_Iron_And = 1; + public static final int Gate_Iron_Or = 2; + public static final int Gate_Gold_And = 3; + public static final int Gate_Gold_Or = 4; + public static final int Gate_Diamond_And = 5; + public static final int Gate_Diamond_Or = 6; + + public static final int Autarchic_Gate = 7; + public static final int Autarchic_Gate_Iron_And = 8; + public static final int Autarchic_Gate_Iron_Or = 9; + public static final int Autarchic_Gate_Gold_And = 10; + public static final int Autarchic_Gate_Gold_Or = 11; + public static final int Autarchic_Gate_Diamond_And = 12; + public static final int Autarchic_Gate_Diamond_Or = 13; + + public static final int MAX = 14; + +} diff --git a/common/buildcraft/transport/IconConstants.java b/common/buildcraft/transport/IconTerrainConstants.java similarity index 56% rename from common/buildcraft/transport/IconConstants.java rename to common/buildcraft/transport/IconTerrainConstants.java index fc04a543..27d9dec6 100644 --- a/common/buildcraft/transport/IconConstants.java +++ b/common/buildcraft/transport/IconTerrainConstants.java @@ -1,6 +1,6 @@ package buildcraft.transport; -public class IconConstants { +public class IconTerrainConstants { public static final int PipeStructureCobblestone = 0; public static final int PipeItemsCobbleStone = 1; @@ -44,7 +44,39 @@ public class IconConstants { public static final int Texture_Yellow_Lit = 38; public static final int Texture_Cyan = 39; - public static final int MAX = 40; + public static final int Gate_Dark = 40; + public static final int Gate_Lit = 41; + public static final int Gate_Iron_And_Dark = 42; + public static final int Gate_Iron_And_Lit = 43; + public static final int Gate_Iron_Or_Dark = 43; + public static final int Gate_Iron_Or_Lit = 44; + public static final int Gate_Gold_And_Dark = 45; + public static final int Gate_Gold_And_Lit = 46; + public static final int Gate_Gold_Or_Dark = 47; + public static final int Gate_Gold_Or_Lit = 48; + public static final int Gate_Diamond_And_Dark = 49; + public static final int Gate_Diamond_And_Lit = 50; + public static final int Gate_Diamond_Or_Dark = 51; + public static final int Gate_Diamond_Or_Lit = 52; + + public static final int Gate_Autarchic_Dark = 53; + public static final int Gate_Autarchic_Lit = 54; + public static final int Gate_Autarchic_Iron_And_Dark = 55; + public static final int Gate_Autarchic_Iron_And_Lit = 56; + public static final int Gate_Autarchic_Iron_Or_Dark = 57; + public static final int Gate_Autarchic_Iron_Or_Lit = 58; + public static final int Gate_Autarchic_Gold_And_Dark = 59; + public static final int Gate_Autarchic_Gold_And_Lit = 60; + public static final int Gate_Autarchic_Gold_Or_Dark = 61; + public static final int Gate_Autarchic_Gold_Or_Lit = 62; + public static final int Gate_Autarchic_Diamond_And_Dark = 63; + public static final int Gate_Autarchic_Diamond_And_Lit = 64; + public static final int Gate_Autarchic_Diamond_Or_Dark = 65; + public static final int Gate_Autarchic_Diamond_Or_Lit = 66; + + public static final int MAX = 67; + + } diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 635c2e78..5aa85d7d 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -7,6 +7,8 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import buildcraft.BuildCraftTransport; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; @@ -26,30 +28,51 @@ public class ItemGate extends ItemBuildCraft { @SuppressWarnings({ "all" }) @Override - public int getIconFromDamage(int i) { + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage(int i) { int n = 0; if (series > 0) { n = 3; } else { n = 2; } - - switch (i) { - case 0: - return n * 16 + 6; - case 1: - return n * 16 + 7; - case 2: - return n * 16 + 8; - case 3: - return n * 16 + 9; - case 4: - return n * 16 + 10; - case 5: - return n * 16 + 11; - default: - return n * 16 + 12; + + if (series == 0){ //Normal Gates + switch (i) { + case 0: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate]; + case 1: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Iron_And]; + case 2: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Iron_Or]; + case 3: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Gold_And]; + case 4: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Gold_Or]; + case 5: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Diamond_And]; + default: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Diamond_Or]; + } + } else if (series == 1){ + switch (i) { + case 0: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate]; + case 1: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_And]; + case 2: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_Or]; + case 3: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_And]; + case 4: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_Or]; + case 5: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_And]; + default: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_Or]; + } } + return null; } @Override diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index f2842252..017a8462 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -16,7 +16,7 @@ import buildcraft.transport.utils.WireMatrix; public class PipeRenderState implements IClientState { private boolean hasGate = false; - private int gateTextureIndex = 0; + private int gateIconIndex = 0; public final ConnectionMatrix pipeConnectionMatrix = new ConnectionMatrix(); public final TextureMatrix textureMatrix = new TextureMatrix(); @@ -42,15 +42,15 @@ public class PipeRenderState implements IClientState { return hasGate; } - public void setGateTexture(int value) { - if (gateTextureIndex != value) { - gateTextureIndex = value; + public void setGateIconIndex(int value) { + if (gateIconIndex != value) { + gateIconIndex = value; dirty = true; } } - public int getGateTextureIndex() { - return gateTextureIndex; + public int getGateIconIndex() { + return gateIconIndex; } public void clean() { @@ -68,7 +68,7 @@ public class PipeRenderState implements IClientState { @Override public void writeData(DataOutputStream data) throws IOException { data.writeBoolean(hasGate); - data.writeInt(gateTextureIndex); + data.writeInt(gateIconIndex); pipeConnectionMatrix.writeData(data); textureMatrix.writeData(data); wireMatrix.writeData(data); @@ -78,7 +78,7 @@ public class PipeRenderState implements IClientState { @Override public void readData(DataInputStream data) throws IOException { hasGate = data.readBoolean(); - gateTextureIndex = data.readInt(); + gateIconIndex = data.readInt(); pipeConnectionMatrix.readData(data); textureMatrix.readData(data); wireMatrix.readData(data); diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 82e26f76..40ac1c0c 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -219,7 +219,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank // Gate Textures renderState.setHasGate(pipe.hasGate()); - renderState.setGateTexture(!pipe.hasGate() ? 0 : pipe.gate.getTexture(pipe.isGateActive())); + renderState.setGateIconIndex(!pipe.hasGate() ? 0 : pipe.gate.getTextureIconIndex(pipe.isGateActive())); // Facades for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { diff --git a/common/buildcraft/transport/TransportProxy.java b/common/buildcraft/transport/TransportProxy.java index 9fc31c8f..a601f578 100644 --- a/common/buildcraft/transport/TransportProxy.java +++ b/common/buildcraft/transport/TransportProxy.java @@ -18,7 +18,11 @@ public class TransportProxy { public void registerRenderers() { } - public void loadIcons(BuildCraftTransport buildCraftTransport) { + public void loadTerrainIcons(BuildCraftTransport instance) { + } + + public void loadItemIcons(BuildCraftTransport instance){ + } } diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index d08fc30d..625ff26d 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -62,60 +62,112 @@ public class TransportProxyClient extends TransportProxy { } @Override - public void loadIcons(BuildCraftTransport instance) { - instance.icons = new Icon[IconConstants.MAX]; + public void loadTerrainIcons(BuildCraftTransport instance) { + instance.terrainIcons = new Icon[IconTerrainConstants.MAX]; TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.field_94154_l; - instance.icons[IconConstants.PipeStructureCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeStructureCobblestone"); - instance.icons[IconConstants.PipeItemsCobbleStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsCobblestone"); + instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeStructureCobblestone"); - instance.icons[IconConstants.PipeItemsDiamond_Center] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_center"); - instance.icons[IconConstants.PipeItemsDiamond_Down] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_down"); - instance.icons[IconConstants.PipeItemsDiamond_Up] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_up"); - instance.icons[IconConstants.PipeItemsDiamond_North] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_north"); - instance.icons[IconConstants.PipeItemsDiamond_South] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_south"); - instance.icons[IconConstants.PipeItemsDiamond_West] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_west"); - instance.icons[IconConstants.PipeItemsDiamond_East] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_east"); + instance.terrainIcons[IconTerrainConstants.PipeItemsCobbleStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsCobblestone"); - instance.icons[IconConstants.PipeItemsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsWood_standard"); - instance.icons[IconConstants.PipeAllWood_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllWood_solid"); + instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Center] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_center"); + instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Down] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_down"); + instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Up] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_up"); + instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_North] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_north"); + instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_South] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_south"); + instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_West] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_west"); + instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_East] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_east"); - instance.icons[IconConstants.PipeItemsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsEmerald_standard"); - instance.icons[IconConstants.PipeAllEmerald_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllEmerald_solid"); + instance.terrainIcons[IconTerrainConstants.PipeItemsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsWood_standard"); + instance.terrainIcons[IconTerrainConstants.PipeAllWood_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllWood_solid"); - instance.icons[IconConstants.PipeItemsGold] = terrainTextures.func_94245_a("buildcraft:pipeItemsGold"); + instance.terrainIcons[IconTerrainConstants.PipeItemsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsEmerald_standard"); + instance.terrainIcons[IconTerrainConstants.PipeAllEmerald_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllEmerald_solid"); - instance.icons[IconConstants.PipeItemsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsIron_standard"); - instance.icons[IconConstants.PipeAllIron_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllIron_solid"); + instance.terrainIcons[IconTerrainConstants.PipeItemsGold] = terrainTextures.func_94245_a("buildcraft:pipeItemsGold"); - instance.icons[IconConstants.PipeItemsObsidian] = terrainTextures.func_94245_a("buildcraft:pipeItemsObsidian"); - instance.icons[IconConstants.PipeItemsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeItemsSandstone"); - instance.icons[IconConstants.PipeItemsStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsStone"); - instance.icons[IconConstants.PipeItemsVoid] = terrainTextures.func_94245_a("buildcraft:pipeItemsVoid"); + instance.terrainIcons[IconTerrainConstants.PipeItemsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsIron_standard"); + instance.terrainIcons[IconTerrainConstants.PipeAllIron_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllIron_solid"); - instance.icons[IconConstants.PipeLiquidsCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsCobblestone"); - instance.icons[IconConstants.PipeLiquidsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsWood_standard"); - instance.icons[IconConstants.PipeLiquidsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsEmerald_standard"); - instance.icons[IconConstants.PipeLiquidsGold] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsGold"); - instance.icons[IconConstants.PipeLiquidsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsIron_standard"); - instance.icons[IconConstants.PipeLiquidsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsSandstone"); - instance.icons[IconConstants.PipeLiquidsStone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsStone"); - instance.icons[IconConstants.PipeLiquidsVoid] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsVoid"); + instance.terrainIcons[IconTerrainConstants.PipeItemsObsidian] = terrainTextures.func_94245_a("buildcraft:pipeItemsObsidian"); + instance.terrainIcons[IconTerrainConstants.PipeItemsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeItemsSandstone"); + instance.terrainIcons[IconTerrainConstants.PipeItemsStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsStone"); + instance.terrainIcons[IconTerrainConstants.PipeItemsVoid] = terrainTextures.func_94245_a("buildcraft:pipeItemsVoid"); - instance.icons[IconConstants.PipePowerGold] = terrainTextures.func_94245_a("buildcraft:pipePowerGold"); - instance.icons[IconConstants.PipePowerStone] = terrainTextures.func_94245_a("buildcraft:pipePowerStone"); - instance.icons[IconConstants.PipePowerWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipePowerWood_standard"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsCobblestone"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsWood_standard"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsEmerald_standard"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsGold] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsGold"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsIron_standard"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsSandstone"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsStone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsStone"); + instance.terrainIcons[IconTerrainConstants.PipeLiquidsVoid] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsVoid"); - instance.icons[IconConstants.Texture_Red_Dark] = terrainTextures.func_94245_a("buildcraft:texture_red_dark"); - instance.icons[IconConstants.Texture_Red_Lit] = terrainTextures.func_94245_a("buildcraft:texture_red_lit"); - instance.icons[IconConstants.Texture_Blue_Dark] = terrainTextures.func_94245_a("buildcraft:texture_blue_dark"); - instance.icons[IconConstants.Texture_Blue_Lit] = terrainTextures.func_94245_a("buildcraft:texture_blue_lit"); - instance.icons[IconConstants.Texture_Green_Dark] = terrainTextures.func_94245_a("buildcraft:texture_green_dark"); - instance.icons[IconConstants.Texture_Green_Lit] = terrainTextures.func_94245_a("buildcraft:texture_green_lit"); - instance.icons[IconConstants.Texture_Yellow_Dark] = terrainTextures.func_94245_a("buildcraft:texture_yellow_dark"); - instance.icons[IconConstants.Texture_Yellow_Lit] = terrainTextures.func_94245_a("buildcraft:texture_yellow_lit"); - instance.icons[IconConstants.Texture_Cyan] = terrainTextures.func_94245_a("buildcraft:texture_cyan"); + instance.terrainIcons[IconTerrainConstants.PipePowerGold] = terrainTextures.func_94245_a("buildcraft:pipePowerGold"); + instance.terrainIcons[IconTerrainConstants.PipePowerStone] = terrainTextures.func_94245_a("buildcraft:pipePowerStone"); + instance.terrainIcons[IconTerrainConstants.PipePowerWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipePowerWood_standard"); + instance.terrainIcons[IconTerrainConstants.Texture_Red_Dark] = terrainTextures.func_94245_a("buildcraft:texture_red_dark"); + instance.terrainIcons[IconTerrainConstants.Texture_Red_Lit] = terrainTextures.func_94245_a("buildcraft:texture_red_lit"); + instance.terrainIcons[IconTerrainConstants.Texture_Blue_Dark] = terrainTextures.func_94245_a("buildcraft:texture_blue_dark"); + instance.terrainIcons[IconTerrainConstants.Texture_Blue_Lit] = terrainTextures.func_94245_a("buildcraft:texture_blue_lit"); + instance.terrainIcons[IconTerrainConstants.Texture_Green_Dark] = terrainTextures.func_94245_a("buildcraft:texture_green_dark"); + instance.terrainIcons[IconTerrainConstants.Texture_Green_Lit] = terrainTextures.func_94245_a("buildcraft:texture_green_lit"); + instance.terrainIcons[IconTerrainConstants.Texture_Yellow_Dark] = terrainTextures.func_94245_a("buildcraft:texture_yellow_dark"); + instance.terrainIcons[IconTerrainConstants.Texture_Yellow_Lit] = terrainTextures.func_94245_a("buildcraft:texture_yellow_lit"); + instance.terrainIcons[IconTerrainConstants.Texture_Cyan] = terrainTextures.func_94245_a("buildcraft:texture_cyan"); + instance.terrainIcons[IconTerrainConstants.Gate_Dark] = terrainTextures.func_94245_a("buildcraft:gate_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Lit] = terrainTextures.func_94245_a("buildcraft:gate_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Iron_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_iron_and_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Iron_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_iron_and_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Iron_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_iron_or_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Iron_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_iron_or_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Gold_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_gold_and_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Gold_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_gold_and_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Gold_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_gold_or_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Gold_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_gold_or_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Diamond_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_diamond_and_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Diamond_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_diamond_and_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Diamond_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_diamond_or_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Diamond_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_diamond_or_lit"); + + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_and_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_and_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_or_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_or_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_and_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_and_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_or_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_or_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_and_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_and_lit"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_or_dark"); + instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_or_lit"); + } + + @Override + public void loadItemIcons(BuildCraftTransport instance) { + instance.itemIcons = new Icon[IconItemConstants.MAX]; + TextureMap itemTextures = Minecraft.getMinecraft().renderEngine.field_94155_m; + + instance.itemIcons[IconItemConstants.Gate] = itemTextures.func_94245_a("buildcraft:gate"); + instance.itemIcons[IconItemConstants.Gate_Iron_And] = itemTextures.func_94245_a("buildcraft:gate_iron_and"); + instance.itemIcons[IconItemConstants.Gate_Iron_Or] = itemTextures.func_94245_a("buildcraft:gate_iron_or"); + instance.itemIcons[IconItemConstants.Gate_Gold_And] = itemTextures.func_94245_a("buildcraft:gate_gold_and"); + instance.itemIcons[IconItemConstants.Gate_Gold_Or] = itemTextures.func_94245_a("buildcraft:gate_gold_or"); + instance.itemIcons[IconItemConstants.Gate_Diamond_And] = itemTextures.func_94245_a("buildcraft:gate_diamond_and"); + instance.itemIcons[IconItemConstants.Gate_Diamond_Or] = itemTextures.func_94245_a("buildcraft:gate_diamond_or"); + + instance.itemIcons[IconItemConstants.Autarchic_Gate] = itemTextures.func_94245_a("buildcraft:autarchic_gate"); + instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_iron_and"); + instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_iron_or"); + instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_gold_and"); + instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_gold_or"); + instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_and"); + instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_or"); + } } diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index 4ed267e7..9054f3c8 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -28,12 +28,12 @@ public class PipeItemsCobblestone extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeItemsCobbleStone; + return IconTerrainConstants.PipeItemsCobbleStone; } } diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index 20b50b70..547d4382 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -28,7 +28,7 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.network.IClientState; import buildcraft.transport.IPipeTransportItemsHook; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -41,19 +41,19 @@ public class PipeItemsDiamond extends Pipe implements IPipeTransportItemsHook, I @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { switch(direction){ - case UNKNOWN: return IconConstants.PipeItemsDiamond_Center; - case DOWN: return IconConstants.PipeItemsDiamond_Down; - case UP: return IconConstants.PipeItemsDiamond_Up; - case NORTH: return IconConstants.PipeItemsDiamond_North; - case SOUTH: return IconConstants.PipeItemsDiamond_South; - case WEST: return IconConstants.PipeItemsDiamond_West; - case EAST: return IconConstants.PipeItemsDiamond_East; + case UNKNOWN: return IconTerrainConstants.PipeItemsDiamond_Center; + case DOWN: return IconTerrainConstants.PipeItemsDiamond_Down; + case UP: return IconTerrainConstants.PipeItemsDiamond_Up; + case NORTH: return IconTerrainConstants.PipeItemsDiamond_North; + case SOUTH: return IconTerrainConstants.PipeItemsDiamond_South; + case WEST: return IconTerrainConstants.PipeItemsDiamond_West; + case EAST: return IconTerrainConstants.PipeItemsDiamond_East; default: throw new IllegalArgumentException("direction out of bounds"); } } diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index 2c0d29a0..6769cda8 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -22,7 +22,7 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.SimpleInventory; import buildcraft.core.utils.Utils; import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.PipeTransportItems; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -40,8 +40,8 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory protected PipeItemsEmerald(int itemID, PipeTransportItems transport) { super(transport, new PipeLogicEmerald(), itemID); - standardIconIndex = IconConstants.PipeItemsEmerald_Standard; - solidIconIndex = IconConstants.PipeAllEmerald_Solid; + standardIconIndex = IconTerrainConstants.PipeItemsEmerald_Standard; + solidIconIndex = IconTerrainConstants.PipeAllEmerald_Solid; } public PipeItemsEmerald(int itemID) { diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index 7949589a..d0db38da 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -21,7 +21,7 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -34,12 +34,12 @@ public class PipeItemsGold extends Pipe implements IPipeTransportItemsHook { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeItemsGold; + return IconTerrainConstants.PipeItemsGold; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index d09a99ba..f5939690 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -14,14 +14,14 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; public class PipeItemsIron extends Pipe { - private int standardIconIndex = IconConstants.PipeItemsIron_Standard; - private int solidIconIndex = IconConstants.PipeAllIron_Solid; + private int standardIconIndex = IconTerrainConstants.PipeItemsIron_Standard; + private int solidIconIndex = IconTerrainConstants.PipeAllIron_Solid; public PipeItemsIron(int itemID) { super(new PipeTransportItems(), new PipeLogicIron(), itemID); @@ -32,7 +32,7 @@ public class PipeItemsIron extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index 343eb6b4..7877281e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -34,7 +34,7 @@ import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -62,12 +62,12 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeItemsObsidian; + return IconTerrainConstants.PipeItemsObsidian; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index 7a366d58..b351f4f4 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -15,7 +15,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -27,11 +27,11 @@ public class PipeItemsSandstone extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeItemsSandstone; + return IconTerrainConstants.PipeItemsSandstone; } } diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index 5c3c9c1c..ac40cacd 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -21,7 +21,7 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -35,12 +35,12 @@ public class PipeItemsStone extends Pipe implements IPipeTransportItemsHook { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeItemsStone; + return IconTerrainConstants.PipeItemsStone; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index f1b543df..8a4e4970 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -18,7 +18,7 @@ import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.transport.EntityData; import buildcraft.transport.IItemTravelingHook; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -32,12 +32,12 @@ public class PipeItemsVoid extends Pipe implements IItemTravelingHook { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeItemsVoid; + return IconTerrainConstants.PipeItemsVoid; } // This is called if the void pipe is only connected to one pipe diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 6a17fa3b..ed9a6093 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -29,7 +29,7 @@ import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; @@ -37,8 +37,8 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor { private IPowerProvider powerProvider; - protected int standardIconIndex = IconConstants.PipeItemsWood_Standard; - protected int solidIconIndex = IconConstants.PipeAllWood_Solid; + protected int standardIconIndex = IconTerrainConstants.PipeItemsWood_Standard; + protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid; protected PipeItemsWood(PipeTransportItems transport, PipeLogic logic, int itemID) { super(transport, logic, itemID); @@ -59,7 +59,7 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java index e92b3372..fb8e599a 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -27,11 +27,11 @@ public class PipeLiquidsCobblestone extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeLiquidsCobblestone; + return IconTerrainConstants.PipeLiquidsCobblestone; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java index fe365a44..239667af 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java @@ -8,7 +8,7 @@ */ package buildcraft.transport.pipes; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.PipeTransportLiquids; /** @@ -20,8 +20,8 @@ public class PipeLiquidsEmerald extends PipeLiquidsWood { public PipeLiquidsEmerald(int itemID) { super(new PipeLogicEmerald(), itemID); - standardIconIndex = IconConstants.PipeLiquidsEmerald_Standard; - solidIconIndex = IconConstants.PipeAllEmerald_Solid; + standardIconIndex = IconTerrainConstants.PipeLiquidsEmerald_Standard; + solidIconIndex = IconTerrainConstants.PipeAllEmerald_Solid; ((PipeTransportLiquids) transport).flowRate = 40; ((PipeTransportLiquids) transport).travelDelay = 4; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsGold.java b/common/buildcraft/transport/pipes/PipeLiquidsGold.java index 404468fc..684c421b 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsGold.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsGold.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -30,12 +30,12 @@ public class PipeLiquidsGold extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeLiquidsGold; + return IconTerrainConstants.PipeLiquidsGold; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsIron.java b/common/buildcraft/transport/pipes/PipeLiquidsIron.java index e049a259..83e86ffb 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsIron.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsIron.java @@ -14,14 +14,14 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; public class PipeLiquidsIron extends Pipe { - protected int standardIconIndex = IconConstants.PipeLiquidsIron_Standard; - protected int solidIconIndex = IconConstants.PipeAllIron_Solid; + protected int standardIconIndex = IconTerrainConstants.PipeLiquidsIron_Standard; + protected int solidIconIndex = IconTerrainConstants.PipeAllIron_Solid; public PipeLiquidsIron(int itemID) { @@ -31,7 +31,7 @@ public class PipeLiquidsIron extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java index 02f62cd4..9999663e 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -17,7 +17,7 @@ import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.transport.IPipeTransportLiquidsHook; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.TileGenericPipe; @@ -30,12 +30,12 @@ public class PipeLiquidsSandstone extends Pipe implements IPipeTransportLiquidsH @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeLiquidsSandstone; + return IconTerrainConstants.PipeLiquidsSandstone; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsStone.java b/common/buildcraft/transport/pipes/PipeLiquidsStone.java index fb155f21..9c884fe3 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsStone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsStone.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -29,12 +29,12 @@ public class PipeLiquidsStone extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeLiquidsStone; + return IconTerrainConstants.PipeLiquidsStone; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java index e684756c..ff0ca3ca 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java @@ -17,7 +17,7 @@ import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.transport.IPipeTransportLiquidsHook; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -30,12 +30,12 @@ public class PipeLiquidsVoid extends Pipe implements IPipeTransportLiquidsHook { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeLiquidsVoid; + return IconTerrainConstants.PipeLiquidsVoid; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index bf2731ea..749892e0 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -26,7 +26,7 @@ import buildcraft.api.transport.PipeManager; import buildcraft.core.DefaultProps; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.network.TileNetworkData; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportLiquids; @@ -37,8 +37,8 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { private IPowerProvider powerProvider; - protected int standardIconIndex = IconConstants.PipeLiquidsWood_Standard; - protected int solidIconIndex = IconConstants.PipeAllWood_Solid; + protected int standardIconIndex = IconTerrainConstants.PipeLiquidsWood_Standard; + protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid; long lastMining = 0; boolean lastPower = false; @@ -128,7 +128,7 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index f991b10d..da89707f 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportPower; @@ -29,12 +29,12 @@ public class PipePowerGold extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipePowerGold; + return IconTerrainConstants.PipePowerGold; } } diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index c0f77728..6c397c30 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -14,7 +14,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportPower; @@ -27,12 +27,12 @@ public class PipePowerStone extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipePowerStone; + return IconTerrainConstants.PipePowerStone; } } diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 830fad56..f9b96654 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -19,7 +19,7 @@ import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.TileGenericPipe; @@ -30,8 +30,8 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { private IPowerProvider powerProvider; - protected int standardIconIndex = IconConstants.PipePowerWood_Standard; - protected int solidIconIndex = IconConstants.PipeAllWood_Solid; + protected int standardIconIndex = IconTerrainConstants.PipePowerWood_Standard; + protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid; private int overheatTicks; @@ -47,7 +47,7 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index 96d4eea1..8746493c 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -6,7 +6,7 @@ import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportStructure; @@ -19,11 +19,11 @@ public class PipeStructureCobblestone extends Pipe { @Override @SideOnly(Side.CLIENT) public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.icons; + return BuildCraftTransport.instance.terrainIcons; } @Override public int getIconIndex(ForgeDirection direction) { - return IconConstants.PipeStructureCobblestone; + return IconTerrainConstants.PipeStructureCobblestone; } } diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index 10a432e9..d16fed0a 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.ItemFacade; import buildcraft.transport.pipes.PipeStructureCobblestone; @@ -65,7 +65,7 @@ public class FacadeItemRenderer implements IItemRenderer { // Render StructurePipe block = BuildCraftTransport.genericPipeBlock; - Icon textureID = BuildCraftTransport.instance.icons[IconConstants.PipeStructureCobblestone]; // Structure pipe + Icon textureID = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone]; // Structure pipe block.setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos - 1F / 16F); block.setBlockBoundsForItemRender(); diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 1ca39370..9f8c10ce 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -12,7 +12,7 @@ import buildcraft.api.transport.IPipe.WireColor; import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeRenderState; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TransportProxy; import buildcraft.transport.pipes.PipeStructureCobblestone; @@ -139,22 +139,22 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); if (state.wireMatrix.hasWire(WireColor.Red)) { - state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Red)?IconConstants.Texture_Red_Lit:IconConstants.Texture_Red_Dark]; + state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Red)?IconTerrainConstants.Texture_Red_Lit:IconTerrainConstants.Texture_Red_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMinPos, IPipe.WireColor.Red, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Blue)) { - state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Blue)?IconConstants.Texture_Blue_Lit:IconConstants.Texture_Blue_Dark]; + state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Blue)?IconTerrainConstants.Texture_Blue_Lit:IconTerrainConstants.Texture_Blue_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos, IPipe.WireColor.Blue, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Green)) { - state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Green)?IconConstants.Texture_Green_Lit:IconConstants.Texture_Green_Dark]; + state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Green)?IconTerrainConstants.Texture_Green_Lit:IconTerrainConstants.Texture_Green_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMinPos, Utils.pipeMinPos, IPipe.WireColor.Green, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Yellow)) { - state.currentTexture = BuildCraftTransport.instance.icons[state.wireMatrix.isWireLit(WireColor.Yellow)?IconConstants.Texture_Yellow_Lit:IconConstants.Texture_Yellow_Dark]; + state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Yellow)?IconTerrainConstants.Texture_Yellow_Lit:IconTerrainConstants.Texture_Yellow_Dark]; pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, IPipe.WireColor.Yellow, x, y, z); } @@ -241,7 +241,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { zeroState[2][0] = Utils.pipeMinPos; zeroState[2][1] = Utils.pipeMaxPos; - state.currentTexture = BuildCraftTransport.instance.icons[IconConstants.PipeStructureCobblestone]; // Structure Pipe + state.currentTexture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone]; // Structure Pipe for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if (state.facadeMatrix.isConnected(direction) && !state.pipeConnectionMatrix.isConnected(direction)) { @@ -476,7 +476,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { private void pipeGateRender(RenderBlocks renderblocks, Block block, PipeRenderState state, int x, int y, int z) { - state.currentTexture = state.getGateTextureIndex(); + state.currentTexture = BuildCraftTransport.instance.itemIcons[state.getGateIconIndex()]; float min = Utils.pipeMinPos + 0.05F; float max = Utils.pipeMaxPos - 0.05F; diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index 1dc97d83..18baef5a 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -36,7 +36,7 @@ import buildcraft.core.render.RenderEntityBlock; import buildcraft.core.render.RenderEntityBlock.BlockInterface; import buildcraft.core.utils.Utils; import buildcraft.transport.EntityData; -import buildcraft.transport.IconConstants; +import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; @@ -195,7 +195,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { initialized = true; BlockInterface block = new BlockInterface(); - block.texture = BuildCraftTransport.instance.icons[IconConstants.Texture_Cyan]; + block.texture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.Texture_Cyan]; float size = Utils.pipeMaxPos - Utils.pipeMinPos; @@ -221,7 +221,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glEndList(); } - block.texture = BuildCraftTransport.instance.icons[IconConstants.Texture_Red_Dark]; + block.texture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.Texture_Red_Dark]; size = Utils.pipeMaxPos - Utils.pipeMinPos; From 90f776be7abf2407846170bdf7e3f9fc633ea3a9 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 9 Mar 2013 15:05:08 +0100 Subject: [PATCH 05/93] Fix derp --- common/buildcraft/BuildCraftTransport.java | 8 ++++++-- common/buildcraft/transport/Gate.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 139b48bc..c9c543b0 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -101,7 +101,10 @@ public class BuildCraftTransport { public static BlockGenericPipe genericPipeBlock; @SideOnly(Side.CLIENT) - public Icon[] icons; + public Icon[] terrainIcons; + + @SideOnly(Side.CLIENT) + public Icon[] itemIcons; public static boolean alwaysConnectPipes; public static boolean usePipeLoss; @@ -361,7 +364,8 @@ public class BuildCraftTransport { // MinecraftForge.setGuiHandler(mod_BuildCraftTransport.instance, new GuiHandler()); TransportProxy.proxy.registerTileEntities(); - TransportProxy.proxy.loadIcons(this); + TransportProxy.proxy.loadTerrainIcons(this); + TransportProxy.proxy.loadItemIcons(this); // dockingStationBlock = new // BlockDockingStation(Integer.parseInt(dockingStationId.value)); diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 6498a1cb..e4525e83 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -96,7 +96,7 @@ public abstract class Gate { public abstract void addTrigger(LinkedList list); // / TEXTURES - public abstract int getTexture(boolean isSignalActive); + public abstract int getTextureIconIndex(boolean isSignalActive); public abstract String getGuiFile(); From ffa806418d0e202349f1dcbe89ed51f91c4962af Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 9 Mar 2013 15:28:00 +0100 Subject: [PATCH 06/93] Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update --- .../transport/BlockGenericPipe.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index a955c294..6c901a50 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -97,41 +97,41 @@ public class BlockGenericPipe extends BlockContainer { @SuppressWarnings("rawtypes") @Override - public void getCollisionBoxes(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { + public void addCollisionBoxesToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); TileEntity tile1 = world.getBlockTileEntity(i, j, k); TileGenericPipe tileG = (TileGenericPipe) tile1; if (Utils.checkPipesConnections(world, tile1, i - 1, j, k)) { setBlockBounds(0.0F, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i + 1, j, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, 1.0F, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j - 1, k)) { setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j + 1, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j, k - 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, 0.0F, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkPipesConnections(world, tile1, i, j, k + 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, 1.0F); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG != null) { @@ -139,32 +139,32 @@ public class BlockGenericPipe extends BlockContainer { if (tileG.hasFacade(ForgeDirection.EAST)) { setBlockBounds(1 - facadeThickness, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.WEST)) { setBlockBounds(0.0F, 0.0F, 0.0F, facadeThickness, 1.0F, 1.0F); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.UP)) { setBlockBounds(0.0F, 1 - facadeThickness, 0.0F, 1.0F, 1.0F, 1.0F); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.DOWN)) { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, facadeThickness, 1.0F); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.SOUTH)) { setBlockBounds(0.0F, 0.0F, 1 - facadeThickness, 1.0F, 1.0F, 1.0F); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (tileG.hasFacade(ForgeDirection.NORTH)) { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, facadeThickness); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } } From 0ee0382060d77a598cb266c96d9640e71c959af5 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 9 Mar 2013 10:50:45 -0500 Subject: [PATCH 07/93] Split sheets for krapht --- .../buildcraft/textures/items/guiicons_0_0.png | Bin 0 -> 393 bytes .../buildcraft/textures/items/guiicons_0_1.png | Bin 0 -> 401 bytes .../buildcraft/textures/items/guiicons_0_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_0_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_0_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_0_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_0_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_0_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_0_2.png | Bin 0 -> 587 bytes .../buildcraft/textures/items/guiicons_0_3.png | Bin 0 -> 572 bytes .../buildcraft/textures/items/guiicons_0_4.png | Bin 0 -> 578 bytes .../buildcraft/textures/items/guiicons_0_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_0_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_0_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_0_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_0_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_10_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_10_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_10_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_10_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_10_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_10_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_10_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_10_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_11_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_11_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_11_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_11_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_11_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_11_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_11_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_12_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_12_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_12_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_12_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_12_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_12_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_12_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_13_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_13_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_13_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_13_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_13_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_13_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_13_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_14_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_14_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_14_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_14_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_14_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_14_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_14_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_0.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_1.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_10.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_15_11.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_15_12.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_15_13.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_15_14.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_15_15.png | Bin 0 -> 331 bytes .../buildcraft/textures/items/guiicons_15_2.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_3.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_4.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_5.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_6.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_7.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_8.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_15_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_1_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_1_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_1_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_1_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_1_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_1_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_1_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_1_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_2_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_2_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_2_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_2_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_2_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_2_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_2_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_3_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_3_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_3_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_3_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_3_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_3_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_3_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_4_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_4_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_4_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_4_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_4_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_4_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_4_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_5_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_5_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_5_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_5_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_5_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_5_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_5_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_6_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_6_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_6_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_6_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_6_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_6_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_6_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_7_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_7_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_7_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_7_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_7_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_7_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_7_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_8_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_8_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_8_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_8_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_8_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_8_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_8_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_1.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_10.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_9_11.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_9_12.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_9_13.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_9_14.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_9_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guiicons_9_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guiicons_9_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_0_0.png | Bin 0 -> 417 bytes .../buildcraft/textures/items/guitriggers_0_1.png | Bin 0 -> 410 bytes .../textures/items/guitriggers_0_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_0_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_0_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_0_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_0_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_0_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_0_2.png | Bin 0 -> 406 bytes .../buildcraft/textures/items/guitriggers_0_3.png | Bin 0 -> 426 bytes .../buildcraft/textures/items/guitriggers_0_4.png | Bin 0 -> 403 bytes .../buildcraft/textures/items/guitriggers_0_5.png | Bin 0 -> 421 bytes .../buildcraft/textures/items/guitriggers_0_6.png | Bin 0 -> 403 bytes .../buildcraft/textures/items/guitriggers_0_7.png | Bin 0 -> 426 bytes .../buildcraft/textures/items/guitriggers_0_8.png | Bin 0 -> 400 bytes .../buildcraft/textures/items/guitriggers_0_9.png | Bin 0 -> 421 bytes .../textures/items/guitriggers_10_0.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_1.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_10.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_10_11.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_10_12.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_10_13.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_10_14.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_10_15.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_10_2.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_3.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_4.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_5.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_6.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_7.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_8.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_10_9.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_0.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_1.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_10.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_11_11.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_11_12.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_11_13.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_11_14.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_11_15.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_11_2.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_3.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_4.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_5.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_6.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_7.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_8.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_11_9.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_0.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_1.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_10.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_12_11.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_12_12.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_12_13.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_12_14.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_12_15.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_12_2.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_3.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_4.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_5.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_6.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_7.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_8.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_12_9.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_0.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_1.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_10.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_13_11.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_13_12.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_13_13.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_13_14.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_13_15.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_13_2.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_3.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_4.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_5.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_6.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_7.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_8.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_13_9.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_0.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_1.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_10.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_14_11.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_14_12.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_14_13.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_14_14.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_14_15.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_14_2.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_3.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_4.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_5.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_6.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_7.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_8.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_14_9.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_0.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_1.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_10.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_15_11.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_15_12.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_15_13.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_15_14.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_15_15.png | Bin 0 -> 331 bytes .../textures/items/guitriggers_15_2.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_3.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_4.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_5.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_6.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_7.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_8.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_15_9.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_1_0.png | Bin 0 -> 351 bytes .../buildcraft/textures/items/guitriggers_1_1.png | Bin 0 -> 351 bytes .../textures/items/guitriggers_1_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_1_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_1_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_1_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_1_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_1_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_1_2.png | Bin 0 -> 351 bytes .../buildcraft/textures/items/guitriggers_1_3.png | Bin 0 -> 351 bytes .../buildcraft/textures/items/guitriggers_1_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_1_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_1_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_1_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_1_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_1_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_2_0.png | Bin 0 -> 340 bytes .../buildcraft/textures/items/guitriggers_2_1.png | Bin 0 -> 351 bytes .../textures/items/guitriggers_2_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_2_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_2_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_2_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_2_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_2_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_2_2.png | Bin 0 -> 360 bytes .../buildcraft/textures/items/guitriggers_2_3.png | Bin 0 -> 343 bytes .../buildcraft/textures/items/guitriggers_2_4.png | Bin 0 -> 494 bytes .../buildcraft/textures/items/guitriggers_2_5.png | Bin 0 -> 499 bytes .../buildcraft/textures/items/guitriggers_2_6.png | Bin 0 -> 499 bytes .../buildcraft/textures/items/guitriggers_2_7.png | Bin 0 -> 497 bytes .../buildcraft/textures/items/guitriggers_2_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_2_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_3_0.png | Bin 0 -> 340 bytes .../buildcraft/textures/items/guitriggers_3_1.png | Bin 0 -> 343 bytes .../textures/items/guitriggers_3_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_3_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_3_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_3_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_3_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_3_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_3_2.png | Bin 0 -> 352 bytes .../buildcraft/textures/items/guitriggers_3_3.png | Bin 0 -> 358 bytes .../buildcraft/textures/items/guitriggers_3_4.png | Bin 0 -> 347 bytes .../buildcraft/textures/items/guitriggers_3_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_3_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_3_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_3_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_3_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_4_0.png | Bin 0 -> 364 bytes .../buildcraft/textures/items/guitriggers_4_1.png | Bin 0 -> 350 bytes .../textures/items/guitriggers_4_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_4_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_4_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_4_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_4_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_4_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_4_2.png | Bin 0 -> 348 bytes .../buildcraft/textures/items/guitriggers_4_3.png | Bin 0 -> 360 bytes .../buildcraft/textures/items/guitriggers_4_4.png | Bin 0 -> 371 bytes .../buildcraft/textures/items/guitriggers_4_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_4_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_4_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_4_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_4_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_5_0.png | Bin 0 -> 439 bytes .../buildcraft/textures/items/guitriggers_5_1.png | Bin 0 -> 441 bytes .../textures/items/guitriggers_5_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_5_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_5_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_5_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_5_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_5_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_5_2.png | Bin 0 -> 441 bytes .../buildcraft/textures/items/guitriggers_5_3.png | Bin 0 -> 439 bytes .../buildcraft/textures/items/guitriggers_5_4.png | Bin 0 -> 440 bytes .../buildcraft/textures/items/guitriggers_5_5.png | Bin 0 -> 445 bytes .../buildcraft/textures/items/guitriggers_5_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_5_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_5_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_5_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_1.png | Bin 0 -> 329 bytes .../textures/items/guitriggers_6_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_6_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_6_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_6_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_6_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_6_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_6_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_3.png | Bin 0 -> 337 bytes .../buildcraft/textures/items/guitriggers_6_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_6_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_1.png | Bin 0 -> 329 bytes .../textures/items/guitriggers_7_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_7_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_7_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_7_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_7_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_7_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_7_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_7_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_1.png | Bin 0 -> 329 bytes .../textures/items/guitriggers_8_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_8_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_8_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_8_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_8_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_8_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_8_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_8_9.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_0.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_1.png | Bin 0 -> 329 bytes .../textures/items/guitriggers_9_10.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_9_11.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_9_12.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_9_13.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_9_14.png | Bin 0 -> 330 bytes .../textures/items/guitriggers_9_15.png | Bin 0 -> 330 bytes .../buildcraft/textures/items/guitriggers_9_2.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_3.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_4.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_5.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_6.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_7.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_8.png | Bin 0 -> 329 bytes .../buildcraft/textures/items/guitriggers_9_9.png | Bin 0 -> 329 bytes 512 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_9.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_0.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_1.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_10.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_11.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_12.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_13.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_14.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_15.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_2.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_3.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_4.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_5.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_6.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_7.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_8.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_9.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_0.png new file mode 100644 index 0000000000000000000000000000000000000000..808090e57f5fd85c33023351adae81a86c42ae49 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15<&q! zA+Fi>_1EhEKY1?0vtpg#n=k+W|9`Ey(F-WcR1)MD%)n4K`K$$y$C%{p?!x*b|K)KY zhqJ&VvY3H^TL^?1FWs&C0~ECKba4#fxSpKQ!06`4ao~7B6BC=8t3W)5#?l-OjT{Y? zGY=L$dXx0%P0FE!H5wT@8W}1b0nHa&Z*Vc3WagT!>=-#8Xo_lyYeY#(Vo9o1a#1Rf zVlXl=G}1LR&^0m%F*39=Ftsu;(KRr!GB9v^_Pqv0LvDUbW?Cg~4d%Q34*)d?f^103 i%t_5l%uTf_0Wug2;th7NZd3qDGI+ZBxvX=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15)uJE zA+Fi>_1EhE|G(<>|NqVZ|KAnmXN3CM{r~@e&0aHZpcY zcCo~c*FX+ufk$L90|U1Z2s2)~TlWVjXyfVP7{YNqIiZ2k&5?t_Xi5Xa5dkAMCfAU* zZf?c41)DZ*6ucp$sH*B};A~(blC&uyYL>#RjtHeGjBE@?uJEZCM4xB?nxk6c8c~vx zSdwa$T$Bo=7>o=IjdTqSbd5|xj0~*|Osxz|bPY_b3=G_!eXl{$kei>9nO2EggZXa% p13(ReARE#$b5ipXb5pHKfD8tMc*FBdjoW~d44$rjF6*2UngD%hboKxM literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_10.png new file mode 100644 index 0000000000000000000000000000000000000000..0668a9414c6d38e3468a1ec697fc8199129c9342 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L3 TP3*KJP?o{d)z4*}Q$iB}j^J6a literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_11.png new file mode 100644 index 0000000000000000000000000000000000000000..1fa0bf03ba59df20585e9b91457ba7281aa8a6a7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L> TQ1Ev@P?o{d)z4*}Q$iB}lk{30 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_12.png new file mode 100644 index 0000000000000000000000000000000000000000..54edfc262283df332caa913807166877704b453a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~K? TA+gF7D9hmK>gTe~DWM4fgx*;Z literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_13.png new file mode 100644 index 0000000000000000000000000000000000000000..1b49e048af6c439a6a253b6e40643be642b8134f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~Mg TFF$KBP?o{d)z4*}Q$iB}i+)*- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_14.png new file mode 100644 index 0000000000000000000000000000000000000000..5b8c62ba7c2bfce05ed8d2695c43ae83fbe75cc7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L5 Tv6>$!$-v<0>gTe~DWM4fi85I~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_15.png new file mode 100644 index 0000000000000000000000000000000000000000..ad541993e75f4eaf102f735b679bc8352918ccba GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L@ Ttj2yCP?o{d)z4*}Q$iB}kl45bDP46hOx7_4S6Fo+k-*%fF5lxPX? z331J~ufJCRAIK|?mUgoQ(axDyQE0HKT}piMYcX(sWL+K(4j+ZZEYcT zViVG|wAJLz^i_4#<(Dp9T2@x3qb?^eBVHb5km#vCapFW*Q>g?0HC=7=CnYQQC8`zs z%OyIBl?TW)MXN2(lb@QSr==>ZqbjSVDyJwb{{R1fhpT*-fG%Ju3GxGZkYV%Wv{^uk zG0EHAMO$U(6AmDUv%n*=n1O*?2!t6g-L3lr6zuSHaSV~ToZ5d=sL6oGRWNAQwOs+C zYo#1xwEq2Pm&&m|QSqtd{GF33k>8HzaCQG_S8(9aU}ZR=5|HWk(1tTv?DW-Lt8zq~ z^0w`+(toOGI>&n6tIfsJns%7H-TFH3?c9z>L03As+W&|yt=kYdr+dfa%nFO!8hgI4 zpI7|<-0{opb%Or<7k=EC!vFn0#~bq#Pv-*Nq*~${QIe8al4_M)lnSI6j0_BobPWx3 zjZ8v}46O`Itqe?b4NR;I4BVc5uR+m}o1c=IR*74K`ELIMKn;Q*8`3g!Qu7jXQ>{vX Y345bDP46hOx7_4S6Fo+k-*%fF5l&A~v z331J~ufJCR-_6d*(OTct*3ei_b#czKjTqNn=Ai4$E-rT%}EcD2!;l&svBs8;MRm*^-~ z9w5^ct+qT*erk@Mma43ds;ri(oT9Awe;}x7o(psdQ%R5?&}(Ir&sqR^j7i?^E}Eyd zx2ga+oCO|{#S9GGLLkg|>2BR0pkSk?i(`ny<t&K-z4xD! zbIQ2~D`v<4KI=EBcaeUs-B;lT0Re7?35*La>9l$>9Lp*H?K~@uTfj*F)GLjrnks8- z<5#WTDp^^u`?~LKyI1Ohy551xT66yJB>hcVl=faY|L|eEn8I_Vw!iBl_P+c4TJOvH zI~+xc?600N@Erjq9i4;B-JXpC>2OC7#SEE=^7g78kvL`8Cn^bS{az=8kkra z7`Q$AUW1|`H$NpatrE8e^WFXjfEolrHl$_dq~;~&rdpK%84L#T#)>=-W&tG`JYD@< J);T3K0RV}8w%h;! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_4.png new file mode 100644 index 0000000000000000000000000000000000000000..6d4a18b994653ad0d97d40eaa91ab5e5d80bb348 GIT binary patch literal 578 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lxPg_ z331J~ufJCRzc^aj&CbZtTHn>y&{$7(b*1i-BK7`ESq&B0`go)lrvUx^!t-S(%QyoV<*9d6Yq-r~1T+6J1TE&M+{z+UQS8R_;qwEB2R5 zbQCKOkZFomTb?IBHAhcNRaQq;R!db*QC9r_|Nl{6R|C~EFqZ`RfqeI??8rSJ#hB#n z?xGdE@5($NhqJ&VvY3H^TL^?1FWs&C0~Bobba4!kxLn$w%imkC(cf`DozI^93yI^b3l@2cT|4cLUW@>!PeDQ)uzFNBB`#$*_{O9|x zFR!t>?ezax@2a;PQJx<~9s`}DTH+c}l9E`GYL#4+3Zxi}3=EBQ4GnaSOhSwdtqe@9 z3`}$lOsotH+@5`}LD7(#pOTqYiCcsDZvO*74T2yW(lT>W^AdAYtxA9l27`E${TZc} PKuHEqS3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5N~=S S-*r7ulEKr}&t;ucLK6Txv02^# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_6.png new file mode 100644 index 0000000000000000000000000000000000000000..f8b0b800d49fb6211b8b36255037f5154d1b69af GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5N{Tk SCL#)yWbkzLb6Mw<&;$S}OIVZu literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_7.png new file mode 100644 index 0000000000000000000000000000000000000000..40e2cc6ca78d5232ef39b2513dea54f2b7036e91 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5O1!Q SsL~9SWbkzLb6Mw<&;$T1*I45K literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_8.png new file mode 100644 index 0000000000000000000000000000000000000000..414f795737a29e70e9a8c1ea5c203ed1697912a2 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5O1;V So+Z$c3=E#GelF{r5}E)wq*;{! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_9.png new file mode 100644 index 0000000000000000000000000000000000000000..71af1846ce1033b6354ae6a87d35442d3ebf3b53 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5N~<# SCMVFl3=E#GelF{r5}E)!L|NVd literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_0.png new file mode 100644 index 0000000000000000000000000000000000000000..2ff2011e5c71b7edcfb8eae671a30a389c831dcd GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^93 TEk4ZyD9hmK>gTe~DWM4fkJnkl literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_1.png new file mode 100644 index 0000000000000000000000000000000000000000..253b8d790344ec8c00c42a272d191fc5c7c03c2a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^9> TFe2<8P?o{d)z4*}Q$iB}lI>a! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_10.png new file mode 100644 index 0000000000000000000000000000000000000000..1b55820aaa066d1707e914e31c472b7160b4b2e4 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` UFjcT(2~e8B)78&qol`;+0Od7V)Bpeg literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_11.png new file mode 100644 index 0000000000000000000000000000000000000000..214e980e97be8efab344470e1737857cefe87a88 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` U_(;sd2q?|q>FVdQ&MBb@0O9vpg#Z8m literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_12.png new file mode 100644 index 0000000000000000000000000000000000000000..4777d810ed71bee72ce5d540ed7e31c27cbba312 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` UR4p&r0hDI&boFyt=akR{0Nv|ZPXGV_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_13.png new file mode 100644 index 0000000000000000000000000000000000000000..5d33f18be37d44703152a1a74cdf9a57a769499f GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` U%p;*G2b5;;boFyt=akR{0Ma2?fB*mh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_14.png new file mode 100644 index 0000000000000000000000000000000000000000..9fabd4956dfe94c694c72a52f0d287078b208887 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` UGO1?IUZ6CCr>mdKI;Vst0Pu@iod5s; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_15.png new file mode 100644 index 0000000000000000000000000000000000000000..57d64b1ae09854901c58c17c4ac00d0482618a2c GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` U`n0-78z{}->FVdQ&MBb@0PC|_E&u=k literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c649a22d5a5fef005e80db12c8a765b70883c392 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^8? S5y%d5F@vY8pUXO@geCxifmqf6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_3.png new file mode 100644 index 0000000000000000000000000000000000000000..032d2dfe614af1081acd15d1ffaeb279facac84d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^Ag SA7%~;90pHUKbLh*2~7ZvBU!Nk literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c58fe22bc20a427ae5fb4649b894ea319acfdf57 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^95 T(P&X1P?o{d)z4*}Q$iB}kmXt0 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_5.png new file mode 100644 index 0000000000000000000000000000000000000000..842dfe3ecfd09497dfd230dcc5b56fd054784332 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^9@ T%yiOmpe%!@tDnm{r-UW|laX2( literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_6.png new file mode 100644 index 0000000000000000000000000000000000000000..79bb0e42d836a4a58920c0b22810e1481fe42bde GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^8^ TZ*#a7D9hmK>gTe~DWM4fjE7mF literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_7.png new file mode 100644 index 0000000000000000000000000000000000000000..83d802808d43d9225350beca19efe41d648e787f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^Ai TVg30vP?o{d)z4*}Q$iB}l}}no literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_8.png new file mode 100644 index 0000000000000000000000000000000000000000..73611d3ca078e290933b5e5ef42c6f81f4d0c2c0 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^94 Tqvc%{P?o{d)z4*}Q$iB}oTOT; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_9.png new file mode 100644 index 0000000000000000000000000000000000000000..cced19b48ea7682ac952d6f3a83616af7c4ce4c4 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^9? TzWLr8pe%!@tDnm{r-UW|p8#6r literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_0.png new file mode 100644 index 0000000000000000000000000000000000000000..faee0b04e4ea0287e4c0d18f674626366dfac051 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%vB TeJ)QuP?o{d)z4*}Q$iB}k$YL- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c7c768b32e7485fd29a1044798ec560e258a60 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%v} SV3rNY{|uh4elF{r5}E*&@mfIu literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_10.png new file mode 100644 index 0000000000000000000000000000000000000000..77714dff5a69c41dae25307052db9c85855c71d6 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc!N) TVXgc@pfrQ0tDnm{r-UW|!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 U7_~}294O7;>FVdQ&MBb@0OGn?o&W#< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_12.png new file mode 100644 index 0000000000000000000000000000000000000000..72d69c43edbdcb140e306c89fe50e1ccffa836b3 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 Uba-*yTc9+9r>mdKI;Vst0QBNo<^TWy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_13.png new file mode 100644 index 0000000000000000000000000000000000000000..8d29f79c48e4e503aeddd79c0a067edb5b3f6e5e GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 Uyk&`BHBg$t)78&qol`;+0PCn)Hvj+t literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_14.png new file mode 100644 index 0000000000000000000000000000000000000000..e161f4aaad884640bb1f5f46d03976f80a21cd9c GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 UqIKZ*4WKlGr>mdKI;Vst0P!qZv;Y7A literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_15.png new file mode 100644 index 0000000000000000000000000000000000000000..2ce69e17182b0a5a8dc801ea4c892a12ea173857 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 U8hiY;A5faX)78&qol`;+0PeI}bpQYW literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_2.png new file mode 100644 index 0000000000000000000000000000000000000000..6a29e8ea334f19c58dd88d70f3e1c9dbf8fd04a5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%u~ TIXO2ND9hmK>gTe~DWM4fiaA+t literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_3.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf9c5597df53900e3654e87ff33bfe37dd67862 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%wo THzoEcP?o{d)z4*}Q$iB}kds;H literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_4.png new file mode 100644 index 0000000000000000000000000000000000000000..9c669796172165c9cef20b27cda86c3ca83d34bc GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%vD T;lqhEpe%!@tDnm{r-UW|pD$X| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_5.png new file mode 100644 index 0000000000000000000000000000000000000000..e77c75ff49fae3ae6135e084edcb88720b24e6e2 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%w0 T{QHj&Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%v1 T_iv>aP?o{d)z4*}Q$iB}ljT|# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_7.png new file mode 100644 index 0000000000000000000000000000000000000000..963a24a25295af23987e2af7a13faf99e7950462 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%wq T`E%wSpe%!@tDnm{r-UW|n&n!b literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_8.png new file mode 100644 index 0000000000000000000000000000000000000000..85e10df8eb8ded651c6b066787fc5f086de957c9 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%vC T)2#*QZw3ZWS3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%v~ T&T-3ape%!@tDnm{r-UW|m;732 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_0.png new file mode 100644 index 0000000000000000000000000000000000000000..f65edbc534d97b82feda1e0996811264af176862 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX7 U_4X#9pBWfDUHx3vIVCg!0GXd!Y5)KL literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_1.png new file mode 100644 index 0000000000000000000000000000000000000000..1386bb4f51926e0186ce6f7072b7ae100c739238 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX_ T=uXoHpe%!@tDnm{r-UW|n(!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UU@x&jA1KY>>FVdQ&MBb@0NsUIN&o-= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_11.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd1ec9de55de8b6afb925c94013743cb565f292 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ U=po;*6DZB#>FVdQ&MBb@0OIjkwEzGB literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_12.png new file mode 100644 index 0000000000000000000000000000000000000000..589ee984a32effa9de5466e75bdb627d2517f1b3 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UbW!XgD3BODUHx3vIVCg!0OmVc(EtDd literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_13.png new file mode 100644 index 0000000000000000000000000000000000000000..574651077ee23c074af794d55242020e02436116 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UyiD-nRG>72r>mdKI;Vst0PCAtL;wH) literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_14.png new file mode 100644 index 0000000000000000000000000000000000000000..fb4be23f4bd810c5fea80c5fa56ad61053d36123 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UVo_RR29##-boFyt=akR{0N>wPZvX%Q literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_15.png new file mode 100644 index 0000000000000000000000000000000000000000..24e917cbb481631fa735b15099e599f39b1604ad GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ U>R;rt04UAi>FVdQ&MBb@0OR#pz5oCK literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c7a18bd922cde65d801e3d22d760e59d49ef98 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTW` Tef2UZ)EGQn{an^LB{Ts5kSSTw literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_3.png new file mode 100644 index 0000000000000000000000000000000000000000..81bc6e2f6c783f1ddadd13a27c7c2749b00426a7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTYk TbLsIMpe%!@tDnm{r-UW|nP*yp literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_4.png new file mode 100644 index 0000000000000000000000000000000000000000..28c0c1becdb10fd3882116d10e9f85db9b121566 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX9 TX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX{ Tbfeo!pe%!@tDnm{r-UW|l|5Q4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_6.png new file mode 100644 index 0000000000000000000000000000000000000000..3d073f15757e17fdb8e1d07ed716670dc4a5f540 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTW| TvqM}MD9hmK>gTe~DWM4fg!fqn literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_7.png new file mode 100644 index 0000000000000000000000000000000000000000..f12662170c69e8d3358e388a07fa1abec7b3fb9f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTYm TygTe~DWM4fjSE?y literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_8.png new file mode 100644 index 0000000000000000000000000000000000000000..a4767cb5f9cb9c0b8ba5c36718384562b0935a0e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX8 To54y1D9hmK>gTe~DWM4fhB#Rh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_9.png new file mode 100644 index 0000000000000000000000000000000000000000..346ea71159fda1128c428efa2a6260cf14765a9a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX` ThMlVkD9hmK>gTe~DWM4fhPYWO literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_0.png new file mode 100644 index 0000000000000000000000000000000000000000..6c6ee73688b64a0ad4b315e79656f1a5a6e4c3a8 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{F TMe>FqP?o{d)z4*}Q$iB}k4IU# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_1.png new file mode 100644 index 0000000000000000000000000000000000000000..5de2706f4cc1c31d4f1b3a766a2b334f6911181b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|2 TSnfqTP?o{d)z4*}Q$iB}lW|%U literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_10.png new file mode 100644 index 0000000000000000000000000000000000000000..77d8875575b821e166b37a0e16954db16ca87e94 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U(7xol7f_nP)78&qol`;+0PW6NVE_OC literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_11.png new file mode 100644 index 0000000000000000000000000000000000000000..bd0ddac958c0a1c3ae5d97cd26fc08be99ce1095 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U_+jz$J3wg$Pgg&ebxsLQ0Q{<3YybcN literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_12.png new file mode 100644 index 0000000000000000000000000000000000000000..97e91e0ca1fd9c6ff37408319f4436e4a7dd412b GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 Ul(}kK8c>?S)78&qol`;+0PF}_MgRZ+ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_13.png new file mode 100644 index 0000000000000000000000000000000000000000..595e55dfb4fd05f57952ddc2b2ce1d67a4f1cb1a GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 UEVs7p15ld5)78&qol`;+0PFZ#SpWb4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_14.png new file mode 100644 index 0000000000000000000000000000000000000000..31e669f4ecf56cfde1770f8104d2fa4ed91fbad8 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U(r{8Z7%0u)>FVdQ&MBb@0Og8V$N&HU literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_15.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a390038ff818cacf3b63bb3ea318d2725f6315 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U`u&{pQJ^$~r>mdKI;Vst0Q3M_#{d8T literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0151ec08b09a7bd0f7f8689a4f7c4efb229eba6f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{3 TCBD-ZD9hmK>gTe~DWM4fhBa9% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_3.png new file mode 100644 index 0000000000000000000000000000000000000000..07df039805555f5868cf7530b77181ec921eb15a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|s TE6}+bD9hmK>gTe~DWM4fiUV19 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_4.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c51f375c6dcda9ecae9a4ec766b94e6e5b13b3 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{H TxkQEoD9hmK>gTe~DWM4fiW6B< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_5.png new file mode 100644 index 0000000000000000000000000000000000000000..fbd4b0f9d3b12b1bad271c63158843dc312798e0 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|4 Tq*!MjP?o{d)z4*}Q$iB}kE2=1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_6.png new file mode 100644 index 0000000000000000000000000000000000000000..eed6024fcb7087385cc35a2376ccecb8b58c8af5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{5 TTUDz9lx6UA^>bP0l+XkKhv`{C literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_7.png new file mode 100644 index 0000000000000000000000000000000000000000..558083fbc6d9edbf46260efc5eb23018e9f3e1aa GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|u TRqMM6D9hmK>gTe~DWM4fjg48b literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_8.png new file mode 100644 index 0000000000000000000000000000000000000000..93a468d3f638340ef01d1cb4e95ae8e26128043b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{G T>rj9)P?o{d)z4*}Q$iB}laN{Z literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_9.png new file mode 100644 index 0000000000000000000000000000000000000000..f75206504e92d6b2020bff229cdfff6b21db9caf GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|3 T_GrRZpe%!@tDnm{r-UW|nMhi5 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_0.png new file mode 100644 index 0000000000000000000000000000000000000000..f07c01883e0223d2bfdd6c1b0cd4e48bd61893c5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL5 TG3?wFpe%!@tDnm{r-UW|nAlov literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_1.png new file mode 100644 index 0000000000000000000000000000000000000000..039b19658a80b2381173b2180ec1e4b3096d3c85 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL@ TEbt!_P?o{d)z4*}Q$iB}ktA8% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_10.png new file mode 100644 index 0000000000000000000000000000000000000000..48c543bd24bb159ac646a4502631511f0651fb7e GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| UAXWVSGf!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| Tm|Jomrz@g literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_12.png new file mode 100644 index 0000000000000000000000000000000000000000..be1cf7d0c3f5d9401b1be99ee4a54ae369d8aab5 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| U^rg1%K2Vy$)78&qol`;+0QMeQ_5c6? literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_13.png new file mode 100644 index 0000000000000000000000000000000000000000..e48d30c3b2509bf80f7bec1c6fa2afe7a4d24540 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| U++4NK6DZB#>FVdQ&MBb@0O|Bv9RL6T literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_14.png new file mode 100644 index 0000000000000000000000000000000000000000..dae4eeac1f1b8013453d989b77ad556b76a1a0fc GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| UA}go;3MkFs>FVdQ&MBb@0N!L-Y5)KL literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_15.png new file mode 100644 index 0000000000000000000000000000000000000000..f877f14a0912bb5646ab40e2b6523f249bd6f0c7 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| Tnk6X>GLOO2)z4*}Q$iB}+=N** literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_2.png new file mode 100644 index 0000000000000000000000000000000000000000..80bad2b7031d4036e6528d6d1ae99df233484a5a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBK^ TAF+N1P?o{d)z4*}Q$iB}kQ!O! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_3.png new file mode 100644 index 0000000000000000000000000000000000000000..708b7d3dd4d4513c380fdf9ff9854d14f98a8efa GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBMi T5kFrKD9hmK>gTe~DWM4fi9%Uh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_4.png new file mode 100644 index 0000000000000000000000000000000000000000..d120dc89d440a9dacb23e00236961ef6c71d0c3f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL7 T&6=whD9hmK>gTe~DWM4fjKo=x literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_5.png new file mode 100644 index 0000000000000000000000000000000000000000..fb0ba6d14c33fd98210726a5ff5497477c0ac35e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL_ T(8fv{D9hmK>gTe~DWM4fhH6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBK` TVVb=VD9hmK>gTe~DWM4fi2hk) literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_7.png new file mode 100644 index 0000000000000000000000000000000000000000..6ad76d39b1033bf0e835d383eee2cd7188a9f6ab GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBMk TZxn3~lx6UA^>bP0l+XkKgb-N% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_8.png new file mode 100644 index 0000000000000000000000000000000000000000..53e2b880e1a5c6f34876e0a1393be39dc520d1a9 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL6 Tzt?RUP?o{d)z4*}Q$iB}mh)Of literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_9.png new file mode 100644 index 0000000000000000000000000000000000000000..0bc9311b3976d97dd11182467dea90560dd0d1d8 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL^ TqN@z(M+OE@S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*D TVak%lKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+0 TeDV}ipe%!@tDnm{r-UW|k?>jR literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_10.png new file mode 100644 index 0000000000000000000000000000000000000000..46c041cb619081d1c545a79963a3056337532577 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 Uu;_fpG@vwtr>mdKI;Vst0P(e2rT_o{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_11.png new file mode 100644 index 0000000000000000000000000000000000000000..4aa32c8f01ce9e04627b5974aab20a22fc14829d GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 Uc=f~%pezG}r>mdKI;Vst0Pl}lZ2$lO literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_12.png new file mode 100644 index 0000000000000000000000000000000000000000..0616e00c45aa5a28a3eecb1e7adec33db6e24235 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UmdKI;Vst0P@FL$p8QV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_13.png new file mode 100644 index 0000000000000000000000000000000000000000..7b36a84f7a969a5700ec38db54b693e468cd3940 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UY<=ve4p5rG)78&qol`;+0O|c&AOHXW literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_14.png new file mode 100644 index 0000000000000000000000000000000000000000..15b8c166922dcbe4301b0ee0bcfa4f0ce1acf69b GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UvUHJ8KTw*%)78&qol`;+0PEvgJpcdz literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_15.png new file mode 100644 index 0000000000000000000000000000000000000000..95540a7bfa8f68c5c62261d09050b355167aef25 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UdTD8mBv6{c)78&qol`;+0PB-lC;$Ke literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f70630969a1e206e38a800677219a2cbf626d324 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*1 TH|uCWP?o{d)z4*}Q$iB}lNwqR literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_3.png new file mode 100644 index 0000000000000000000000000000000000000000..80bbc0931917e44fbb98588d8bf941c733b99376 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+q TIrpn1P?o{d)z4*}Q$iB}kg8eS literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_4.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4da6667e7a7d0215f98ddd0c6af3eaeddc77dc GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*F T{b#~1pe%!@tDnm{r-UW|p9Wgf literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_5.png new file mode 100644 index 0000000000000000000000000000000000000000..198c95b27bb9c912ab7c8e1589838ecac34f7b56 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+2 T;9r0aP?o{d)z4*}Q$iB}liXSa literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_6.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f28edaef56b881778a3ea5c4d3d7aa507dc40d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*3 T`JHhZP?o{d)z4*}Q$iB}jwD&K literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_7.png new file mode 100644 index 0000000000000000000000000000000000000000..d717e4b7bf9d5d4125d01e787c8a5bcbf29a4f03 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+s T_rVY-$-v<0>gTe~DWM4fiXK^8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_8.png new file mode 100644 index 0000000000000000000000000000000000000000..29a77c482912c728484da2d1af57d0764ce45b83 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*E T&tGREP?o{d)z4*}Q$iB}kk?t) literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_9.png new file mode 100644 index 0000000000000000000000000000000000000000..4ff69142940d5601f5ef53c3caf2f9fe86fbdfa7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+1 T(nE$FD9hmK>gTe~DWM4fg-uxk literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_0.png new file mode 100644 index 0000000000000000000000000000000000000000..46b38885627b1a69a3af182a9f89cebbaff519f0 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mui S_-%2ZB!j1`pUXO@geCw$BU&K< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_1.png new file mode 100644 index 0000000000000000000000000000000000000000..46ca4159dc807cc241c32eace375ffabf6ae5f2f GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;kv) S!0Se!B!j1`pUXO@geCw-U0SLD literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_10.png new file mode 100644 index 0000000000000000000000000000000000000000..85930f8be911ce0b74273e23a2ec9a17ca7feb67 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k8h Sw`vW@I0jEwKbLh*2~7Z$by^_+ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_11.png new file mode 100644 index 0000000000000000000000000000000000000000..7e6c4bc62cf16c71f647537ff6c1019c00f6930c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k7O TxpvMgpe%!@tDnm{r-UW|lo?ts literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_12.png new file mode 100644 index 0000000000000000000000000000000000000000..15701530a90717d776cd7d44e95c29c9a041c839 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k9Q Tu;gq2P?o{d)z4*}Q$iB}l!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k9& TeevI8Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k8j Sc{~H;d!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k7Q TcOc?3P?o{d)z4*}Q$iB}l80Ik literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_2.png new file mode 100644 index 0000000000000000000000000000000000000000..033468b752856fb230848189c38de1cdfb7177c2 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;hAQ Sa+ftwlEKr}&t;ucLK6TwNm<4K literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_3.png new file mode 100644 index 0000000000000000000000000000000000000000..595bb2e23fa9c8560e2f0a703eac318fadb21398 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mg_ Su4^q&lEKr}&t;ucLK6TwUs=}x literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_4.png new file mode 100644 index 0000000000000000000000000000000000000000..7da220c371dd7539b930eb2c2659f4630a9c30b9 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;my~ Sl{_C%lEKr}&t;ucLK6TqM_EV! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_5.png new file mode 100644 index 0000000000000000000000000000000000000000..f3f0aa771e994a30cba6b1a4ede00b684f60cce3 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;k!V Stv=9e3=E#GelF{r5}E)#7g_ND literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_6.png new file mode 100644 index 0000000000000000000000000000000000000000..456895a586bbf645dceaf9d827b6e682488f83c0 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;hG^ Sq)rJa$>8bg=d#Wzp$PypWm!o8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_7.png new file mode 100644 index 0000000000000000000000000000000000000000..7c6a2e6cd1d60c5f704640316c18b9ea8cab817f GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mn= S*l!C^lEKr}&t;ucLK6Trp;>|e literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_8.png new file mode 100644 index 0000000000000000000000000000000000000000..fc1367f95eca64e58eb4bb635b1b1b38fe211133 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mv% SCRi0H$>8bg=d#Wzp$Pyl%vk~e literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_9.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8c67a234422434d259b8985937ea92bcca69bb GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;kw% SI(aitlEKr}&t;ucLK6TubXlnY literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_0.png new file mode 100644 index 0000000000000000000000000000000000000000..c816db3638e7402a5ea0a66289e71ea00bf4aa6f GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPJ* SG1U(!$>8bg=d#Wzp$PyulUbht literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_1.png new file mode 100644 index 0000000000000000000000000000000000000000..54aa8f25144cf01ac8c1c04693aa54bc31c168b3 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mNK@ SE%XLZlEKr}&t;ucLK6T$AzCm1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_10.png new file mode 100644 index 0000000000000000000000000000000000000000..675c6397bc76a701ccf43e026b3ccfc4cbc6db12 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMuy TBhNeuD9hmK>gTe~DWM4fg(O)L literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_11.png new file mode 100644 index 0000000000000000000000000000000000000000..be88f6276b01c35d915f7f65deb052e6be022437 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMwA TEn&<8lx6UA^>bP0l+XkKc_vsr literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_12.png new file mode 100644 index 0000000000000000000000000000000000000000..85e752287c628be7974be95ba4ee8a48ca1cf6e5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMuW TNib<2P?o{d)z4*}Q$iB}jY3(c literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_13.png new file mode 100644 index 0000000000000000000000000000000000000000..e91b4d9d9714e1bf4d619aeaf0f6a842f0bac674 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMw! TR4hmXD9hmK>gTe~DWM4ficncv literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_14.png new file mode 100644 index 0000000000000000000000000000000000000000..31f3da852296a2516c1ac07219a909fdf4970a7a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMu! TU39z~D9hmK>gTe~DWM4fl#*H{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_15.png new file mode 100644 index 0000000000000000000000000000000000000000..2ee4f3f5c2dac82416a11625b6f4bc5d19f3e44a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMwC TQ~F&ND9hmK>gTe~DWM4fit1T> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_2.png new file mode 100644 index 0000000000000000000000000000000000000000..bf36281d9b8735ab8882fd836a25f895260dbf91 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mJyT S&yoa`WbkzLb6Mw<&;$T3-B|np literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_3.png new file mode 100644 index 0000000000000000000000000000000000000000..fffa9bdad2e0b3484901a2c1ab4605996304cc45 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mP85 SVe$ni$>8bg=d#Wzp$PyrUs;6! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_4.png new file mode 100644 index 0000000000000000000000000000000000000000..4fe9861ffbb39cfb4d912359a73139ea02c74c85 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPQU S&BAb?B!j1`pUXO@geCw&=~`3( literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_5.png new file mode 100644 index 0000000000000000000000000000000000000000..e351d246e7e056cf3c5dcf6222eeb1f6f156d588 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mNR^ S^~8ffNd`|>KbLh*2~7Y!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mJ&v S=s-14lEKr}&t;ucLK6T#TUsRm literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_7.png new file mode 100644 index 0000000000000000000000000000000000000000..be1799daf140995c9beb53954ab6ca1db5101614 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPEj S^ut@AB!j1`pUXO@geCw*Gg_Vi literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_8.png new file mode 100644 index 0000000000000000000000000000000000000000..53958186cbeb2b16ea0b85b3674d4444e3116eb1 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPLL R>Mh7L22WQ%mvv4FO#nbRS}*_r literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_9.png new file mode 100644 index 0000000000000000000000000000000000000000..57138f70992f5993b4e71cd72be5eca88b41458c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mNMb S_U!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;78 SnZFV!$>8bg=d#Wzp$PyoZ&@|~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_1.png new file mode 100644 index 0000000000000000000000000000000000000000..6c11a3b4134edab3e0a517df71b8d4cca56a2e2d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B+8m S#r{1|lEKr}&t;ucLK6TyU0Lw} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_10.png new file mode 100644 index 0000000000000000000000000000000000000000..c119e726f93cf9a81f9fd13f9b6aa5e31f6c5c55 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*iF TWO2%Ope%!@tDnm{r-UW|o8wxg literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_11.png new file mode 100644 index 0000000000000000000000000000000000000000..5263db9e47d532f7a0d2f34934a932ba97ff3b4f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*j2 Tc}YkjP?o{d)z4*}Q$iB}l66_| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_12.png new file mode 100644 index 0000000000000000000000000000000000000000..e72b3bb1b63ecda06a13ab280d641d6cf2d68efb GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*i( TwU+fZP?o{d)z4*}Q$iB}j9por literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_13.png new file mode 100644 index 0000000000000000000000000000000000000000..34e812addf31a3d622193f31c523e61a86aa7125 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*hG TyUG;kZw3ZWS3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*iH T_}qebKv@P)S3j3^P6JCT literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_15.png new file mode 100644 index 0000000000000000000000000000000000000000..e71cb01f0e7d66c3d1c60f2a91fad32b434b66e6 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*j4 T<>Z74pe%!@tDnm{r-UW|nP*yU literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_2.png new file mode 100644 index 0000000000000000000000000000000000000000..bef440ed8d4d4d56d182df7c41f47c29694ac623 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B&lj Sn->a{WbkzLb6Mw<&;$T5C0Q2$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_3.png new file mode 100644 index 0000000000000000000000000000000000000000..8ad2e7ab7033ef89c433f3aafa964c4bc85758c2 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B-`b S6?YgY$>8bg=d#Wzp$PynuUSF> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_4.png new file mode 100644 index 0000000000000000000000000000000000000000..1d7d9edb815967a4b00a8f6d501d6fee24e4e1f0 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;B$ S?{orClEKr}&t;ucLK6Twt69qc literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_5.png new file mode 100644 index 0000000000000000000000000000000000000000..42bb9ccad7862eef759bf795dbb35b7735d8952a GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B+C` S^Y=HPB!j1`pUXO@geCw*e_EOV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_6.png new file mode 100644 index 0000000000000000000000000000000000000000..88dfa3777de1005d1f1ec1cd00b106b94e2d392b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B&q^ Su*wH0$>8bg=d#Wzp$PymiCG{3 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_7.png new file mode 100644 index 0000000000000000000000000000000000000000..ab457eca67c51bd1860e041c8c609b698453170c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;0o SKI;}xlEKr}&t;ucLK6TqX<2sw literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_8.png new file mode 100644 index 0000000000000000000000000000000000000000..d3af64376e77cd35d3b3021339b04c6237b40a5e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;8@ SM!PpqlEKr}&t;ucLK6Tx%vsj} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_9.png new file mode 100644 index 0000000000000000000000000000000000000000..831633740149dba62d7b984f35cc77de81c11745 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B+Ae S{`R{-Nd`|>KbLh*2~7Y;Kw7W> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_0.png new file mode 100644 index 0000000000000000000000000000000000000000..cf450f166ae3e1a700008d3fbd04a42c2181c06b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^u1d RM-t>V22WQ%mvv4FO#n8`S&{$% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_1.png new file mode 100644 index 0000000000000000000000000000000000000000..572fcb607968940bbeeee0e663a594f0cd8a035b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^s2d STQdtN$>8bg=d#Wzp$Pym)L9t- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_10.png new file mode 100644 index 0000000000000000000000000000000000000000..28d9927daf6cb65bc28ecbfe7f681f468873d1db GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rb_ TSrX$1lx6UA^>bP0l+XkKiGf*L literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_11.png new file mode 100644 index 0000000000000000000000000000000000000000..71fd52f2ad88c7d78bce94fa0c0e07c0574ac602 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rdz TSDbSLD9hmK>gTe~DWM4fj!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rd< Ty~;KTD9hmK>gTe~DWM4fk1tua literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_13.png new file mode 100644 index 0000000000000000000000000000000000000000..914b3f41c8e9b8583eaa3afdd0768fe29508690a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rdH TpqBRwP?o{d)z4*}Q$iB}l*d{n literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_14.png new file mode 100644 index 0000000000000000000000000000000000000000..0095a4a15e5e67090eb59fd429d8328a86fe72cd GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rb{ TCpjY=D9hmK>gTe~DWM4fh<#a3 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_15.png new file mode 100644 index 0000000000000000000000000000000000000000..9c0d48d7e2878af95bb959489228ba191885d234 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rd# TDYxPvP?o{d)z4*}Q$iB}i_2M= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ba64a9dec48cfcf152ce8f8106d1088d68c1b4c7 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^og9 SRB-_)$>8bg=d#Wzp$PyoZdp$N literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_3.png new file mode 100644 index 0000000000000000000000000000000000000000..3e90dc82b7815e33f2c471ecea54dca31a2b5117 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^t== S>fr{IWbkzLb6Mw<&;$S`T3BuX literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c8d25a1c3425a83c3bec4fb536352da06226f673 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^u62 S@$OTgB!j1`pUXO@geCw*C|Z#K literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_5.png new file mode 100644 index 0000000000000000000000000000000000000000..61dd3756121d24bb896c4e4560ef82e7e02304a6 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^s7w S?Jdxu3=E#GelF{r5}E))3R+A6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_6.png new file mode 100644 index 0000000000000000000000000000000000000000..fe4dc9be419ec8acd47ec616f06925c25a06b626 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^olk Szvm=SlEKr}&t;ucLK6Ty!de0V literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_7.png new file mode 100644 index 0000000000000000000000000000000000000000..fe62f5a7f650abec9342f59eace9ba049251df4d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^t`U S(Gw4pWbkzLb6Mw<&;$T67+Ea< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_8.png new file mode 100644 index 0000000000000000000000000000000000000000..27b390adb1f6e2fcc5e1c914d31ae7518a38087e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^u5b S`owcUNd`|>KbLh*2~7Y-lUktw literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_9.png new file mode 100644 index 0000000000000000000000000000000000000000..38a483d1c59750cc0f1340a1551e30df7777dbed GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^s6z S!omokB!j1`pUXO@geCw&ZCXkI literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_0.png new file mode 100644 index 0000000000000000000000000000000000000000..545d91a39bf87c32abadc573de8c2907ed7cfe67 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH=g ST=8k3B!j1`pUXO@geCw)oLYSV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e155949e3af122349c964ecbc234e0ce28b19715 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gF>= Sq;o7#lEKr}&t;ucLK6Ty+*#%T literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_10.png new file mode 100644 index 0000000000000000000000000000000000000000..d94a6c659eb3b1ab3bc130484ca00fc0b11498bb GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFRu T@PxHCP?o{d)z4*}Q$iB}lWbY^ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_11.png new file mode 100644 index 0000000000000000000000000000000000000000..62633ec3d9097db4d0402fe6c7b09ada8c7a6b4c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFPg T?L7Bhpe%!@tDnm{r-UW|lmJ>2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_12.png new file mode 100644 index 0000000000000000000000000000000000000000..3354b71ed649bde5b11ad644d3df90bf236007d0 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFRC Te=Ld}D9hmK>gTe~DWM4fhAvqh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_13.png new file mode 100644 index 0000000000000000000000000000000000000000..148ac4c4172a96a9709699de9d5c606dacc7c0b5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFP^ TaWHElP?o{d)z4*}Q$iB}lxA8S literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_14.png new file mode 100644 index 0000000000000000000000000000000000000000..7e031dce01c763dedc4d264cace22ad8488228ca GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFRw TZ0Ua^pe%!@tDnm{r-UW|od#N^ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_15.png new file mode 100644 index 0000000000000000000000000000000000000000..f80121a622634b93c34c61fd4ba1b3c42a0f2b9c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFPi TanboDKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gCSE SK!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gHzA ST&WN!$>8bg=d#Wzp$Pyn_E|Ro literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_4.png new file mode 100644 index 0000000000000000000000000000000000000000..22ad35c242063b9a8b62a3b8679a91ad8317db6d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH_5 S@%BqVNd`|>KbLh*2~7Y-9$K6L literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_5.png new file mode 100644 index 0000000000000000000000000000000000000000..5fa56692b0b09479f2f24c533b71d69aa31f87ea GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gF`T SNxKVBlEKr}&t;ucLK6TzxLNf8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_6.png new file mode 100644 index 0000000000000000000000000000000000000000..c7eb8e567b58d9b66b01c002e39c5adbef45038b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gCZ9 S_S!$7B!j1`pUXO@geCw)q*{>x literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_7.png new file mode 100644 index 0000000000000000000000000000000000000000..59ca05ab3c4675915161b5615dda5bce96592edf GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH(! S>RAR*lEKr}&t;ucLK6TwT3ONn literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_8.png new file mode 100644 index 0000000000000000000000000000000000000000..1bac12680fdd1e16206661a3c58d2babdc7e11fc GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH>d S^!HDoB!j1`pUXO@geCw(Gg@>2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_9.png new file mode 100644 index 0000000000000000000000000000000000000000..400533f41ae9e19e926b160a7e896e080818b29d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gF@A S=yX0%lEKr}&t;ucLK6Tw!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_bp S!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H@dE S|1S$rlEKr}&t;ucLK6T#P+AZG literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_10.png new file mode 100644 index 0000000000000000000000000000000000000000..afce77997d4c4167eada0535b72ef9314b3f651e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??q TxpvA?pe%!@tDnm{r-UW|oa!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??S TQne%)D9hmK>gTe~DWM4fko8&I literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_12.png new file mode 100644 index 0000000000000000000000000000000000000000..d99f633934461a936d5529308bd868da6800f4ef GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H?=I STl^K|e+ExiKbLh*2~7Z&Ia*c# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_13.png new file mode 100644 index 0000000000000000000000000000000000000000..c25ec680786281170ca88b7d6cc1e082f057823b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H?>r TRdTc*D9hmK>gTe~DWM4flP6jW literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_14.png new file mode 100644 index 0000000000000000000000000000000000000000..3f6dfa1dc489776c4ceaa64938a85018c32e324d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??s TMIhh~P?o{d)z4*}Q$iB}luue3 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_15.png new file mode 100644 index 0000000000000000000000000000000000000000..5626992944f2c2195224f659e14e14a1a33200ae GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??U TES}&6lx6UA^>bP0l+XkKhc8(# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_2.png new file mode 100644 index 0000000000000000000000000000000000000000..fd484c095d2267bc1d0a280e62bd5fda78a0f1c8 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H<^P Swq_qtlEKr}&t;ucLK6TyPFeT> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_3.png new file mode 100644 index 0000000000000000000000000000000000000000..994ee5a48d65f053127c285f94f01bca4171f1b9 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_QD SI7b60$>8bg=d#Wzp$Pym##tc% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_4.png new file mode 100644 index 0000000000000000000000000000000000000000..875c85ac4bd93bdc86601f3dda40e9808b6b1a00 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_iq SDQ7oOlEKr}&t;ucLK6Tz5LxU1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_5.png new file mode 100644 index 0000000000000000000000000000000000000000..aaec7c9cd77e7d52e1738979592b1c9cbfb2794f GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H@jy Sk)!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H<~% SI%7FdlEKr}&t;ucLK6Tz%328k literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_7.png new file mode 100644 index 0000000000000000000000000000000000000000..03f4b9f466f60bdd7e74b501d33a429abd7873ba GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_Wf SCc+RX$>8bg=d#Wzp$Pyp+*wip literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_8.png new file mode 100644 index 0000000000000000000000000000000000000000..31ebda296b6a18ec265c1966782d775d0832763a GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_dB S*mVI=lEKr}&t;ucLK6Tuk6ESw literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_9.png new file mode 100644 index 0000000000000000000000000000000000000000..ed8483979a9f1ca777519581de529b88240986e8 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H@ep Sq|^*3$>8bg=d#Wzp$Pyt9a(_@ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_0.png new file mode 100644 index 0000000000000000000000000000000000000000..7860ebdae7ad0563bdd06d9c76bb5b21833d8e12 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fPM SYxz>3B!j1`pUXO@geCwz;93X( literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f242b72b1d1f301c57b1c46bcb36fe9a4f275a GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&dQc Sce*i9lEKr}&t;ucLK6TuL|K;r literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_10.png new file mode 100644 index 0000000000000000000000000000000000000000..8b6d38c3c5462d91c6524d3fd231361d4cb38c09 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c#i Teem-Fpe%!@tDnm{r-UW|nao;- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_11.png new file mode 100644 index 0000000000000000000000000000000000000000..5af87ed98ccf12544cb2bb9dbac7230adf7bcc00 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c!9 TbL_AgP?o{d)z4*}Q$iB}kv3W5 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_12.png new file mode 100644 index 0000000000000000000000000000000000000000..963f7c35385cd4778b6dc4e45c54047b921d871d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c#0 T^!%hApe%!@tDnm{r-UW|nhsif literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_13.png new file mode 100644 index 0000000000000000000000000000000000000000..6def3a949da4549a6116c7bf462eb457aabc0414 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c!T T>BJ%_pe%!@tDnm{r-UW|mz-Ka literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_14.png new file mode 100644 index 0000000000000000000000000000000000000000..2a29fd8ae193bb5e5c6c7d067073be6f6705920f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c#k Tv&MWUP?o{d)z4*}Q$iB}kK$R= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_15.png new file mode 100644 index 0000000000000000000000000000000000000000..b619249b52f75926fcde29df62f8d6dffbd61139 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c!B Ty_#JgD9hmK>gTe~DWM4fg)&(P literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_2.png new file mode 100644 index 0000000000000000000000000000000000000000..85068a3f35c306a2533d892e426508733b7e62fa GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&Z%v Sa;y_5$>8bg=d#Wzp$PytPFbA* literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_3.png new file mode 100644 index 0000000000000000000000000000000000000000..14af81433979c7663b77832a16a56834559fe8ed GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fDT S{7oJx$>8bg=d#Wzp$Pyno>?>i literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_4.png new file mode 100644 index 0000000000000000000000000000000000000000..6d89bf95a9ae942b8c27dc5dfa4492a1fb47f274 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fTs SJ$VmMlEKr}&t;ucLK6TvT3NXO literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_5.png new file mode 100644 index 0000000000000000000000000000000000000000..623b00dc41be460f274e3ba7a56c313c7582f17d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&dV9 SAy^A2$>8bg=d#Wzp$Pyn=vgEH literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_6.png new file mode 100644 index 0000000000000000000000000000000000000000..972c660261de1e86ba7136cce090dacdc580bfde GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&Z++ S$ut2d$>8bg=d#Wzp$Pyhuvp3f literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_7.png new file mode 100644 index 0000000000000000000000000000000000000000..79122b6151dacd6d6f8ff35c390edd29b4c35c68 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fI! SXT%1SWbkzLb6Mw<&;$S^npi~u literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_8.png new file mode 100644 index 0000000000000000000000000000000000000000..bf3ff3ee72c332d39f0ef96fdec647722f481175 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fRE SqW*NCB!j1`pUXO@geCwwt69eY literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_9.png new file mode 100644 index 0000000000000000000000000000000000000000..f44fcafd6c4f265a127c3e9079f0efbf7f510e8a GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&dSM Snmi*=lEKr}&t;ucLK6TpnOQgh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_0.png new file mode 100644 index 0000000000000000000000000000000000000000..5f90a7a049ab6282d2062ec4391a3152bfde237f GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS?f S>;ceg3=E#GelF{r5}E)!>{!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pQ@< S@B$xDlEKr}&t;ucLK6TrfLUh% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_10.png new file mode 100644 index 0000000000000000000000000000000000000000..23643af72e8a284101790c8a93def1a4b474379c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQT9 Tyy)>ape%!@tDnm{r-UW|m!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQUi Tvh;ESP?o{d)z4*}Q$iB}l-*h- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_12.png new file mode 100644 index 0000000000000000000000000000000000000000..107530fcc552e5de39d7ec80ab9e23d59da59573 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQVp TcTLkRpe%!@tDnm{r-UW|psQN% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_13.png new file mode 100644 index 0000000000000000000000000000000000000000..6ba2382810519dfc89fa41c5bf1ac6106ff6d73d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQVR TwR)2eP?o{d)z4*}Q$iB}l;>I= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_14.png new file mode 100644 index 0000000000000000000000000000000000000000..85c1623d936fe7b326541d48371f71b4c39a9d60 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQTB Ta$fyCP?o{d)z4*}Q$iB}kYQQn literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_15.png new file mode 100644 index 0000000000000000000000000000000000000000..730c3827208563914dc1ed5ace754b353f00cf23 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQUk Td_ueuD9hmK>gTe~DWM4fjvHC1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_2.png new file mode 100644 index 0000000000000000000000000000000000000000..20371c597bae33076c07d2e0a38df01a3d7ed0e4 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pNVB S(YOUD$>8bg=d#Wzp$PyphFM(z literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_3.png new file mode 100644 index 0000000000000000000000000000000000000000..63ecc08a48f2effcf4544256c0c482f6f51e627a GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS$7 SzflP&$>8bg=d#Wzp$PyirdZkl literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_4.png new file mode 100644 index 0000000000000000000000000000000000000000..2afa59da0e8e393e7616c4c812f40a440366a60a GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS}w STBQ*v$>8bg=d#Wzp$PytSXqkz literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_5.png new file mode 100644 index 0000000000000000000000000000000000000000..88d84a724768d4cb2021fba62367cf3d08234fba GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pQ~| SMnoJa$>8bg=d#Wzp$PyohFK^8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_6.png new file mode 100644 index 0000000000000000000000000000000000000000..1350f2d37580f03d5742ad8fbaae48b046a51f4c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pNb> S>be#v$>8bg=d#Wzp$Pys3R!{x literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_7.png new file mode 100644 index 0000000000000000000000000000000000000000..8034e72ece36ead7deb520da093b1aa77b8ec981 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS+h SRB8>BWbkzLb6Mw<&;$T4R9OcA literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_8.png new file mode 100644 index 0000000000000000000000000000000000000000..ea56200185068cd06caa7e67b49106fe715a42a1 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS{M SY{n{}B!j1`pUXO@geCw&r&?72 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_9.png new file mode 100644 index 0000000000000000000000000000000000000000..c6b393a88cc73779bfc328715ccd03daafd960d1 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pQ|^ RR0PON44$rjF6*2UngBh8S?mA+ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_0.png new file mode 100644 index 0000000000000000000000000000000000000000..242011371df1a77e1831c7ea06527c9dffcd8c9e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>%t SO4oXzB!j1`pUXO@geCw)s9Jjf literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ea6f6a53e17d6ef9c84e34db18a4a35a453d78ba GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E<&t S@-9oDB!j1`pUXO@geCw%+*&>W literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_10.png new file mode 100644 index 0000000000000000000000000000000000000000..45a46e61f05a44c31898acffd3f574852db0bd99 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EP?o{d)z4*}Q$iB}kE~hA literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_11.png new file mode 100644 index 0000000000000000000000000000000000000000..2b4eec4f69b3c86ea753035b90b63b83348fb54f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8E^t{an^LB{Ts5jqF*N literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_12.png new file mode 100644 index 0000000000000000000000000000000000000000..fa0507135767dc8331506dfda86a76161e33bf13 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8E!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EgTe~DWM4fhVof6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_14.png new file mode 100644 index 0000000000000000000000000000000000000000..ab1e621f3bd9446fd63d89966aaf690c1708fb58 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EgTe~DWM4fkj`1w literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_15.png new file mode 100644 index 0000000000000000000000000000000000000000..4e88e88be1b61a8f6efa7a39b9bfb804ac693ed9 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EgTe~DWM4fkmy;- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_2.png new file mode 100644 index 0000000000000000000000000000000000000000..6fa9b902f6e69a711833bdb49833522875e8575b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E+JM S>vc0wlEKr}&t;ucLK6T&R$5vB literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_3.png new file mode 100644 index 0000000000000000000000000000000000000000..b8867632a60e2eddf129e6828cb8b58af9de8ff3 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>q2 S_qHfdlEKr}&t;ucLK6TvZdtVe literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_4.png new file mode 100644 index 0000000000000000000000000000000000000000..79153d2bc96c2a3bc9649d338ec2cfd4308ed0c8 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>*- Sr{6Z9B!j1`pUXO@geCw#`dTOe literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_5.png new file mode 100644 index 0000000000000000000000000000000000000000..faa91a3f74662c0fb5105a2de44e2e24eeabab0b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E<-g SU!4L_lEKr}&t;ucLK6Ty$XVY2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_6.png new file mode 100644 index 0000000000000000000000000000000000000000..9cc75b5270e952d6659b981759588d64d588d2b1 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E+Q1 SU4Ir(lEKr}&t;ucLK6Ttz*(CB literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_7.png new file mode 100644 index 0000000000000000000000000000000000000000..c84d24ca0fbf34dd331c9f3687bfcd1dd940a3b4 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>w+ SL7oRF$>8bg=d#Wzp$Pyi0$9QT literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_8.png new file mode 100644 index 0000000000000000000000000000000000000000..8b51b590c2165a405780abcd9d49b185a931d02b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>(Z SpJ^^olEKr}&t;ucLK6TnYgr}$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_9.png new file mode 100644 index 0000000000000000000000000000000000000000..c44c3f7d82a2f6fa78fac33d5a90e2f9c7be0303 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E<)x S!-yLw$>8bg=d#Wzp$PyjnOM^R literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_0.png new file mode 100644 index 0000000000000000000000000000000000000000..3e45ecb48e62a494ce2d911ae805eec1c6181f57 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z332W2?*7Zb@c#zG|9*!5|EK@||9?FL!{lNY8-1CnrEX59O7rUj9E=sFmwTiK8QL1i z&ZzLT){{2Z5?50C->Z8|9cT_?lDE5yFwgFoX+REVfk$L90|U1(2s1Lwnj--eH1l+E z43W5;oUlMKA;smfvEkw_gH0P2X(u`xH_v7EZJ5mM+c2Bmw?RCXTi$+FLxaLDE=3Jy z2BU`zCpbjJtbit{mbgZgq$HN4S|t~y0x1R~14AQSLjzqSlMo|AD+5y?(ls!#GB9{B z@y`hq4Y~O#nQ4`{HB3C?QUcT<2(lq9Gbc4KF*nt!1jt}8h&R~5x={fr$>8bg=d#Wz Gp$P!bD|A5s literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_1.png new file mode 100644 index 0000000000000000000000000000000000000000..0cfff2daaa5df54307c90bf3bbb3c653362a4111 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}o& z332W2?ha#M@L*ujWMHUCvh%T3n_TQ-qc1bH)Xm9MX?}fxgR#Q&a*y;NLt6vc85N$^ zdeY`v;z~;Yoi=^T02;!W716?DN5F|*&Z+id$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_10.png new file mode 100644 index 0000000000000000000000000000000000000000..a1b001b7221d57ad3a355f0068be836370a13b8e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^C THL=r@Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^i TLc!ntKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;@n Tg~TdTpe%!@tDnm{r-UW|m~mBz literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_13.png new file mode 100644 index 0000000000000000000000000000000000000000..cba8b32cb9f3942e2a93d02a62f3d786782494b7 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;@{ Tzx=GlKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^K T#cF<_Bm;w|tDnm{r-UW|oW)hP literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_15.png new file mode 100644 index 0000000000000000000000000000000000000000..d33823f08acdcfd501a1d933f5cdfe0afb411d1b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^q TvKsqoKv@P)S3j3^P645bDP46hOx7_4S6Fo+k-*%fF5lyD00 z332W2?k;9vXk%b7W?%?sU}$7u@MB=8V_?W-V8~)%&}Lw$VPFVlU;yd`IwqEZ0cbN& zZx;iD9RmZejpr;eRFc#>80!Lx@?ABzi!2#HBrxHB^3tYo+x#ry3LNJEKhL`h0w zNvc(HQ7VvPFfuSS(ls>DH8Ke?GPE)<1tMJo6DtFQ2NVCCK+%w!pOTqYiCe?OGcF}S n4T2yW(lT>W^AdAYtxA9l27`E`FzyRHKuHEqS3j3^P645bDP46hOx7_4S6Fo+k-*%fF5lyD00 z332W2?*7lfaD{>4D+9w)28QPh496H4elsw9U|{&nzyLJz2?IkV1H%dihW88%KN%Qa zGcY`6V7SS^@Q#7u69a>i(*IWyERjId7?Zr+T|}SW__-L!;VkfoEM{Qf76xHPhFNnY zfP$8uE{-7*my;6|qz#M~aT*vdUY+15oZuRE@YuP7C(j%`%WU30ePaK_i4*4sIta|y zbvo2?NAZx~zU2%>MGS8lNb%7 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c526130a2126218c14ce90d094399b9b593d49a0 GIT binary patch literal 403 zcmZ{d%}PRX5XH}>gi<6kLy3rxiXeo)qEMG0v@0s9m`NBd()>svOY{nTKuEL+1F=>Csj$^)j@OI(6d0& zxn}iPfs3M|9hT9}W&I8tDy_i}I))=ozX#YE1M&yJ7g_mtAjg2u5Wt@R+I0DHewu5H!b+ zb;{A5b}nTBMW56hPRlwnM_qz7pnHgfbnLoz+pIS3S~qoBf9UP)`SnGs(x`_f9UP)+ zRKL&p2?-GGK`|N@V|*kNBY}w-O$H+~n9Ko_k!Kbv12glCJ(b$EKR{|Tnv8G%50sjM iNIO;HG!-78dVq5WSrwq{uX literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_5.png new file mode 100644 index 0000000000000000000000000000000000000000..af19b19d426e73045afa3fb5d4b589761c2dc2c6 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}o& z332W2?p9JNS5o?~q;ye9>7SC)S0$x8N=h%4lrAYLEmBhIR8qREr1VQk>70_%0wtwK zN=i?Zl&&Z#9sPT6ZX?hT#w2fd7p64sniL?1v%n*=n1O*?7=#%aX3dcR3fg+QIEF}E zPEJseHZWSqX<)dRb3?+41gD1^Hf<~}FfuH3WZf}y#*B)HikUwGLOw2@so0RXLSa^e zz%DK!28QIf43{Dm6;}fdQY~?fC`m~yNwrEYN(E93Mh1pPx`qb2MkXOfhE@iqK%{G6 zVr5|PVB((>C>nC}Q!>*kach`(#-#+PK@em^T4qjaUSe*lRSA&6U=VM5BHwjAP?EvZ L)z4*}Q$iB}Fz0z2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_6.png new file mode 100644 index 0000000000000000000000000000000000000000..aa1a6bae551e0fb6ca2224c81a8dffae28be910a GIT binary patch literal 403 zcmZ{dKS)Ax5XZld3QCcz6h$IJC~6RXibg!5P@X&=rKlOyl;)ohvMgUiO%e@>Lm2dj zu(npCrJ*4zqBO*%_N*wXxhaG?$A;kUzW2T3bC>aYM3usz0HBgwf}d1f&*lcIeWuoN zlEzuP+YX#;Dr=!8@?6R#<}b(~@*er2u6|Jvr>>=`wmG!5+}xhl6@{QM@i+-Q83!OPsd){Py(vqEl45bDP46hOx7_4S6Fo+k-*%fF5lyD00 z332W2?q>MU!0?WN;RXZ44+e%z28IU=49gf89x^bjU|`tA!0?fQ;XBx*PYetj7#MCd zFg#&kSj)h$nt@?2gObw!w;N}-15IO0@^*I-eR|{PVjzdJz$3Dlfq`2Xgc%uT&5-~K zT6(%ThDcmaPEe3GFj~ZIu#nqeG3SO2i(aHBKTmk__0 zr*{I5;tGrm3?+38AF7yH4*(5OEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuJ8glbfGSez?YnXV(r39!!5M)DIW=?8eVs5Hc36Q~H5O1!QsL~9S OWbkzLb6Mw<&;$VM>37Kh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_8.png new file mode 100644 index 0000000000000000000000000000000000000000..ea4d30f0b10451c72c65e68f37d9db8d856a75cc GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z332W2?yj$8m@rjp^n0S0?p23;+Njq4e*G8j7B7}Ql6vNIVh%^4i*7y|tn{CpT3 z?HQaM8JZgzl$8EE&Gb9~G>0+C+ucQ&XLrmrAcwQSBeIx*fm;}a85w5HkpK#+db&7< zNL)@%kT5uK;>ejpr;eRFc#>80!Lx@?ABzj5h$P8bxHB?DZ)Mo9&?|leNJEKhL`h0w zNvc(HQ7VvPFfuSS(ls>DH8Ke?GPE)<1tMJo6DtFQ2NVCCK+%w!pOTqYiCe?OGcF}S n4T2yW(lT>W^AdAYtxA9l27`EuZTBpNfRYTJu6{1-oD!M45bDP46hOx7_4S6Fo+k-*%fF5l&}f# z332W2?!I-4VbLOn|Nj{}I~jKEVz_vb;o(Du@822LtYO%^nc?6;h6xiGUcF*?_m1J{ zQHK5d87^F4`0|B8N$J17O+L_E2F4_BcNbxv-7(XE9L@rd$YKTtZeb8+WSBKa0w`$Z z>Eak7aXC3bLE6A*A*X@yV(twOf)AcKbLz~ob7#&R!S*YWx`)(rz<62-iE=3^YZx#5JNMC9x#cD!C{XNHG{07#iss8t59CgcuoG8JGf* zu7Qb_fx&}`e@>ui$jwj5OsmALVd5E=5}*b_kPT^>IjMPxxv5qqKn8!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUC TwfHm-pe%!@tDnm{r-UW|qiR+< literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_1.png new file mode 100644 index 0000000000000000000000000000000000000000..5109c46ab85ec971e233fa3040b5782e5171e4aa GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUi T!icbYKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U!BoMDB|vEgPgg&ebxsLQ0QEmsO8@`> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_11.png new file mode 100644 index 0000000000000000000000000000000000000000..f121a1fdb089c27046a20b1cd5b99ac37a303e79 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U;Uh5*BcL>cr>mdKI;Vst0P+D<`~Uy| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_12.png new file mode 100644 index 0000000000000000000000000000000000000000..dd2ece555d29443c9aef2f19462ddfecd131c1fc GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% UQMJ5e2T+>9)78&qol`;+0PXcv#sB~S literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_13.png new file mode 100644 index 0000000000000000000000000000000000000000..2bd4d071f151fd736001438b03affab170a9806f GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% UF^`0%98j9U)78&qol`;+0OBiD_W%F@ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_14.png new file mode 100644 index 0000000000000000000000000000000000000000..8b364f9ed6c25c89eef36d45d8d5a78285d7a59d GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U$)uV+dx6pnp00i_>zopr005*{6aWAK literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_15.png new file mode 100644 index 0000000000000000000000000000000000000000..59260eb59089dc38ac72d1ebfda14081a3da5d16 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U>C@^SZJ;!Rr>mdKI;Vst0Q!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UTn SMIbxK#SEUVelF{r5}E*&6je!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UT{ Tf0#Kaa2PyY{an^LB{Ts5pte>h literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_4.png new file mode 100644 index 0000000000000000000000000000000000000000..79868ab1d3ddbf014cfd29a4214e2fa21f1f4493 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUK TMWaQ5Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUq TGSf-NfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UTv Tz0KiTpe%!@tDnm{r-UW|pc+;f literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_7.png new file mode 100644 index 0000000000000000000000000000000000000000..bcdf4e792b3f79438ddb9e91231ad2d0cc657dbf GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UU4 ThxO;zKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUG Tjh1&+Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUm T`sRCYfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qi T^|?ItKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q? Tf>|~o|1)^H`njxgN@xNAsf1Rz literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_10.png new file mode 100644 index 0000000000000000000000000000000000000000..c8d9779077611cc6af1c45006665b858e58d0900 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC UVbm)9aG*4Ur>mdKI;Vst0P@6E6#xJL literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_12.png new file mode 100644 index 0000000000000000000000000000000000000000..4139a16c85620a201b2879ba24c04823c8222c19 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC U(c#5)Z-LSbp00i_>zopr00jG2T>t<8 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_13.png new file mode 100644 index 0000000000000000000000000000000000000000..c4cb70004e7496a7bcb4c3c39c963e019437d942 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC U@s=fi)j(+mPgg&ebxsLQ0Q<65t^fc4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_14.png new file mode 100644 index 0000000000000000000000000000000000000000..497da767f2e118b450ae252e07ae7e6ae897b178 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC UiPnMJH-OR%p00i_>zopr00Bi;D*ylh literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_15.png new file mode 100644 index 0000000000000000000000000000000000000000..54c0f26b0491ef608bb6caf748787a6b52b6bced GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC UY3%XWen4pkPgg&ebxsLQ0RFyK>;M1& literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_2.png new file mode 100644 index 0000000000000000000000000000000000000000..094a6e746cdbf4406fb5bfdc2cb97d4e2c5002e1 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%p{ T<>cI8pe%!@tDnm{r-UW|oy=9{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_3.png new file mode 100644 index 0000000000000000000000000000000000000000..ba2bff923fffdba15a1cc372a0aa2135d33082e3 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qS T-;~&+Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qq Tg%2mvfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q~ U^6x)B0A(3GUHx3vIVCg!0J=_B;{X5v literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_6.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad1af83d01e80869cee2de71774c57fa9601706 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q4 T-M^JyKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qa T=g*mUfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qm UO}7@HzZn=jUHx3vIVCg!0HmW!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q` TI>#-yfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fS U)!UnZer90sboFyt=akR{0If1s;Q#;t literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_1.png new file mode 100644 index 0000000000000000000000000000000000000000..3c28e4d2073c4461a3d359bb89fd3a2de4169847 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fy TqB~6+fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ UfxW~AeV{ahr>mdKI;Vst0PT-e!2kdN literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_11.png new file mode 100644 index 0000000000000000000000000000000000000000..4d787d65cd3fcb2ee8ce8f4c3cfdfb7ebbd58525 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ Up@)3KPM|b{r>mdKI;Vst0P_1*EC2ui literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_12.png new file mode 100644 index 0000000000000000000000000000000000000000..6b6e9a16bc5e931249776e73d9051ec9db9421e2 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ U(M7R~pg>~qboFyt=akR{0QN;zNB{r; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_13.png new file mode 100644 index 0000000000000000000000000000000000000000..8318f18cfc18573ad58edf410135185e90a22f9b GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ U@iM`OQ-RV9p00i_>zopr0Q;p@y8r+H literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_14.png new file mode 100644 index 0000000000000000000000000000000000000000..56bc8491c879008d86bfc0d3b3b79b8eba17642a GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ UiA8CN8Bm(R)78&qol`;+0PpEl<^TWy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_15.png new file mode 100644 index 0000000000000000000000000000000000000000..86f9d694c87292c86ac9b9d2a027cdad39a96e11 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ Useh5n0-!X5r>mdKI;Vst0Q3J=H2?qr literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a4b63195c55636364f7828ec726ce186aa60b020 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5e% T_0`LuP-F0P^>bP0l+XkKqr6r~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_3.png new file mode 100644 index 0000000000000000000000000000000000000000..ed859e07724de40c0fd7885d5c2b18636ee517a4 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fC T&!xw6fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fa TrEO*QKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5f) T(v5B_fwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5e< U%?@#(D;XF(UHx3vIVCg!0GNtZeE!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fK T_kQ(Ope%!@tDnm{r-UW|pq^G1 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_8.png new file mode 100644 index 0000000000000000000000000000000000000000..2af569227bb847a4ad1a69f76921b2e3ea66bdfb GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fW TZ3Zh5pe%!@tDnm{r-UW|nafp* literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_9.png new file mode 100644 index 0000000000000000000000000000000000000000..7db79b4514ab58d625a578d40bd6f5d02be70021 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5f$ T8g{NGpe%!@tDnm{r-UW|noCuo literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_0.png new file mode 100644 index 0000000000000000000000000000000000000000..408989e081cf3dd7a9618912057ec34ab718b1ce GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#y T70DZdKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e$7 TV!0RXKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S ULHm;HUO;IEPgg&ebxsLQ0R7lj*Z=?k literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_11.png new file mode 100644 index 0000000000000000000000000000000000000000..674f6a338d04e8d818e67b47a9a0507810deb628 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S V;fKY~?*OG4JYD@<);T3K0RRlcSK|Nx literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_12.png new file mode 100644 index 0000000000000000000000000000000000000000..a44645458934ca46f8081ee98599604506092c77 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S UQRb>`X+UWPPgg&ebxsLQ0Q?eGy#N3J literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_13.png new file mode 100644 index 0000000000000000000000000000000000000000..1bd4aeffe4542db42c62bdc0b3473172dac8c34c GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S UvE16W4?t-KPgg&ebxsLQ0Q>@0&;S4c literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_14.png new file mode 100644 index 0000000000000000000000000000000000000000..98bfe268d9a6a5b87b83a9f2ca8a339ddf4d2d13 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S UNyACuV4yUEr>mdKI;Vst0QHnsKL7v# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_15.png new file mode 100644 index 0000000000000000000000000000000000000000..1f52cafc7ffd7e72c6eb292360a6e621f664cbfe GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S U>GyNWM}g7|p00i_>zopr00bFVJ^%m! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0fabc59be65a8f65a0e0a719b0eafdaa5ffcbe1e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#C TmH19upe%!@tDnm{r-UW|naEY6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a215aba5d2987080c0e1e54359ac8d60c4ff4069 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#i TuR!N&pe%!@tDnm{r-UW|ot9PZ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_4.png new file mode 100644 index 0000000000000000000000000000000000000000..9f75b8274d0a581656b013a8148e1dcfd0f66cd1 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#) T!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e$F Tl46~CKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#K TZB?xbP?o{d)z4*}Q$iB}n|xKc literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_7.png new file mode 100644 index 0000000000000000000000000000000000000000..f1a188f10005d53aadd665ae22a5d7fbe24a751a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#q TSFP_Rpe%!@tDnm{r-UW|p&(W# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_8.png new file mode 100644 index 0000000000000000000000000000000000000000..0eb67be70f0a9003c8545869f23496209ec4a53e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#$ TtwRCIKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e$B T+M@|ufwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^K T#jtZzfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^q TvcP{#Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UfmHGP&p>GgPgg&ebxsLQ0RAFY`~Uy| literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_11.png new file mode 100644 index 0000000000000000000000000000000000000000..ce0fdfc6e0eac2f33f7a6f4a64160028870ffa15 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UVQ$I&RG>72r>mdKI;Vst0Q+24vj6}9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_12.png new file mode 100644 index 0000000000000000000000000000000000000000..d13299b53efb1df8fc5ca006add9d559c60dfbad GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< U(U;o3`#@<1Pgg&ebxsLQ00uW#Z2$lO literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_13.png new file mode 100644 index 0000000000000000000000000000000000000000..68c005d52dafec296b2d5448fe23f7d7c90225a7 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UadXu^PoOk|r>mdKI;Vst0Qvq_lmGw# literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_14.png new file mode 100644 index 0000000000000000000000000000000000000000..25c5be6c6ec7937dd7a35f1fde227a8565e05f25 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UiL9LVE1)!kr>mdKI;Vst0Pb#8;Q#;t literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_15.png new file mode 100644 index 0000000000000000000000000000000000000000..662705b1457662693c271286fbdab6f7f08a5f9b GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UX_lmP4N#iF)78&qol`;+0PK!ctN;K2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_2.png new file mode 100644 index 0000000000000000000000000000000000000000..187427eaa2b513f1e11b3b2c45b6c13f722debec GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H@v TeZ=}5Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^4 TNBn#}pe%!@tDnm{r-UW|oYhs* literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_4.png new file mode 100644 index 0000000000000000000000000000000000000000..4706c071533d4d2efe97894f0d04e13da00dc1a8 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^S THEXV3pe%!@tDnm{r-UW|pjTE0 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_5.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d35d7ee8e235986cbfdf9a0b8e7e75354b2f80 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^y TLK`b-pe%!@tDnm{r-UW|nf+Cg literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_6.png new file mode 100644 index 0000000000000000000000000000000000000000..0c9dd3a4c7c6eea138609e3cfe7f8d2b08afe931 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H@% Tg=zLepe%!@tDnm{r-UW|oRL-9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_7.png new file mode 100644 index 0000000000000000000000000000000000000000..0a5c939dbe9fb6f2d1a48b9879cc1e673b9e9f85 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^C TzfrU~P?o{d)z4*}Q$iB}m!nm6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_8.png new file mode 100644 index 0000000000000000000000000000000000000000..54fd38017eb000a5bc78d85ebb6212fa692c454e GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^O T{a&|aKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^u Uimo!C9~l@tUHx3vIVCg!0Hd5%JOBUy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_0.png new file mode 100644 index 0000000000000000000000000000000000000000..3532d0b61e3f53e5437708e8600fe7c61d597529 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFq Ug(*uG17#UJUHx3vIVCg!0Ir8u2LJ#7 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_1.png new file mode 100644 index 0000000000000000000000000000000000000000..ca12dfedcc383e1cfcbaf05a10c41d1930f0489a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rF~ T^2t+7fwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U!J_jW(}2zopr00GWd9RL6T literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_11.png new file mode 100644 index 0000000000000000000000000000000000000000..84628987f028a822bf571739f026c3112603fe6f GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U;nfp6fU*n>p00i_>zopr0RNd*!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK Ukzopr00Q7wKmY&$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_13.png new file mode 100644 index 0000000000000000000000000000000000000000..78df1be9694cfca226f06eb9bbaf9288f55bf526 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK UvGuW=IzVX#Pgg&ebxsLQ0Qv`3mjD0& literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_14.png new file mode 100644 index 0000000000000000000000000000000000000000..e94024118a06458170978828a0494a0253aa0a8f GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U$D$v;Y7A literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_15.png new file mode 100644 index 0000000000000000000000000000000000000000..47c276b429fc67916e35777da8aafbe18244af6f GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U>7}JLl0az&Pgg&ebxsLQ0Q;R*p8x;= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_2.png new file mode 100644 index 0000000000000000000000000000000000000000..2d8e97d0a9442746709b92f813a8638f1a856d72 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rF4 T-K?YiKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFa T=iIN7Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFy T^`8m5fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rG7 Tf`0)zKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFC T<#)zuKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFi T-v>jWBm;w|tDnm{r-UW|ov~HY literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_8.png new file mode 100644 index 0000000000000000000000000000000000000000..bcbf5c8da1da2b7a96dcc267b916c570fc7b6241 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFu TJ%62vKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rG3 TN)H)!pe%!@tDnm{r-UW|nBY}; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_0.png new file mode 100644 index 0000000000000000000000000000000000000000..97fdff703b3a528499ce95e291e145f3b28533f2 GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-3)X8GbH?HVEC`3^uOzab1qPdG0EHAg{42^W+0HmS>O>_%)r1c48n{Iv*t(u z1rB0u`&4xJHzu zB$lLFB^RXvDF!10LnB>716?DN5F=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-Eq$uTvstL)H5h4{eQK{ummW@nB?v5!qT5{GZ4t(EbxddW?hkfv%BBh>@X{fhiE_8kkra7(AHx=LCv|-29Zxv`X9>CZ2Ht oIam;6Lt17|YF=V)s#OV)!C)9~c<#XKMxZ2vr>mdKI;Vst0MfNxy#N3J literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_10.png new file mode 100644 index 0000000000000000000000000000000000000000..87dd969bdab9fa6ac259b5c32079ac96e775b491 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5P1 T-l{b!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5QC Ts_` literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_12.png new file mode 100644 index 0000000000000000000000000000000000000000..0e2f0a6fb7cef4380ae79b200d4624c1c6571794 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5PH T!;-TBKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5R7 U_r-sY0c9CHUHx3vIVCg!0JxG@xBvhE literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_14.png new file mode 100644 index 0000000000000000000000000000000000000000..84ebf182e9d8d163cbebe82447096fffdc7601c5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5P9 T=JAYFpe%!@tDnm{r-UW|q|8=X literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_15.png new file mode 100644 index 0000000000000000000000000000000000000000..261bf8cf712baf07527740c2704b94b3d48f9b08 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5QK T+<}PCKv@P)S3j3^P6=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-T&`1{BLCV@5-R0^#5&i%qE}|W0JSK3rl~-%|IZBv%n*=n1O*?7=#%aX3dcR z3MzWKIEHXsPfk$aHPDjQYLN6f=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-T%$ZE-^6FGcYJA{om#!un#E3nB?v5!qT5{GZ4t(EbxddW?hkfv%BBh>@X{fhiE_8kkra7(AHx=LCv|-29Zxv`X9>CZ2IA p0csEg*^ri*lbV;9n`%`8WH1=U8!MdaS__n9@O1TaS?83{1ORfdT!;Vw literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_4.png new file mode 100644 index 0000000000000000000000000000000000000000..2c473b947e4c34216eec39bdf0a1f522e827c19d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c$0mr R!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c+-<> S^?_bvVDNPHb6Mw<&;$TfGgfE- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_6.png new file mode 100644 index 0000000000000000000000000000000000000000..13fca032122fd42cbcce130eb5bcfd540a158119 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c(Z^d RbxJ@<22WQ%mvv4FO#n)PRlooM literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_7.png new file mode 100644 index 0000000000000000000000000000000000000000..aef843fb548b9a55fd23dab5ec71dd3239e7fb11 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1cysl| Rep`T&44$rjF6*2UngC3_Rrvq_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_8.png new file mode 100644 index 0000000000000000000000000000000000000000..525d731b073af27c3c4e4266a72ca90f733e0df9 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c#G{a R!Ky$>22WQ%mvv4FO#nvdRe1ma literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_9.png new file mode 100644 index 0000000000000000000000000000000000000000..6e14b4bf4175beb31b8e53591e2b09d5d9fba3fe GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c*_IQ R$(w!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&ab8yStu&K}qTV3cV{2fr5-l-tI0;Y1}m_AQc53k;M!Q+`=Ht$S`Y;1W-`M)5S4_ z<9c#}18a{W4716?DN5FIal$@O1TaS?83{1OPIJR)PQk literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c5c32c18bc20c6fe42c378f7f94a8c7b64949913 GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&ab8ySpC9Zu+mJ^#AG2yh0$GG0EHAg;|it2V@&(fk$L90|U1(2s1Lwnj--eRPl6i z4B@z*oZ!IPqsYU@)5D{n#K5hcB|0HuD_5(i)T@RI{0zdOoKoj}ZWjU7tCqM%l%yn< zq*^5xr2;7iBLhPtT|)z1Ba;v#Ln{MQAksB3u`)1tF!9d`6b-rgDVb@NxHU{X<5B|D nAPBM{Ei)%IFEKaOsszYjFp4)k(-wLID9PaI>gTe~DWM4f($iZz literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_10.png new file mode 100644 index 0000000000000000000000000000000000000000..54135cfff3c5ce2b691d030a4b92b9fcd4ccb640 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{o+ TjXd)tpe%!@tDnm{r-UW|n737l literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_11.png new file mode 100644 index 0000000000000000000000000000000000000000..8df2fee4fcab5fcf6100df0227c72b451739729c GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{oc Tw}deZP?o{d)z4*}Q$iB}jJZ^_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_12.png new file mode 100644 index 0000000000000000000000000000000000000000..2a122e355a6c47755a8358f52b3ffa88564d81b5 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{qi TB*CP8Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{q? TQ?Vcope%!@tDnm{r-UW|o#R!} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_14.png new file mode 100644 index 0000000000000000000000000000000000000000..4db901d45b837fcb84ca37aea56755cef52046ef GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{o^ Tb!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{ok TPw97Ape%!@tDnm{r-UW|o_$sG literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0dbf49617c81ac7cdbf5c2926c71acb1393e974c GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-St5Be+Gu8|4K^#8=@?MN*NfFyxm<``ZI0@0y&%o9+AZi4BWyX%*Zfnjs#Fp z%hSa%gyVX0!U1Lp*48OgSR8m%RW+OgIGvB&xFK=Ipv|yDh>?j=Cya^V?nm~3woehkfv%BBh>@X{fhiE_8kkra7(AHx=LCv|-29Zx xv`X9>CZ2IA0csEg*^ri*lbV;9n`%`8WH1=T8-@0>BmpHEJYD@<);T3K0RS+TUo8Lt literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_3.png new file mode 100644 index 0000000000000000000000000000000000000000..91fa97ce32f3b95b77dac07035d27b97e011002a GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&ab8ySpC9Zu+mJ^#AG2yh0$GG0EHAg;|it2V@&(fk$L90|U1(2s1Lwnj--el<{M;2Nlw|O9^>bP0l+XkKAMIKV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_4.png new file mode 100644 index 0000000000000000000000000000000000000000..ebcc50eb56b3ddfd00f6805f9afec0ac3bd59a04 GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l*kP5 z332W2?sl^?a4c zkdnH-zWV6~X$=QPr-nvH!Ina94JXF1&kU*wtS6UncbEfhP%UwdC`m~yNwrEYN(E93 zMh1pPx`qb2MkXOfhE@iqK%{G6Vr5|PVB((>C>nC}Q!>*kach`(#-#+PK@em^T4qja fUSe*lRSA&6U=(k%=gq=!pd^E*tDnm{r-UW|SXqW$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_5.png new file mode 100644 index 0000000000000000000000000000000000000000..d76d5097328fca23af18aa4c208b57896e21e486 GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l*kG2 z332W2?sl^?a|rRctjR6FmMZlFeAgPITAp@2u~Ns5Q)pl z2@3oMMuvt)Mw=BlH*DHiTu`LQGGj+&#m^r45bDP46hOx7_4S6Fo+k-*%fF5l*kG2 z332W2?sl^?aKn;Q* k8`3g!Qu7jXQ>{vX3zopr08z_`F#rGn literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_7.png new file mode 100644 index 0000000000000000000000000000000000000000..8ff3210cf5df5aae0589de88dc9c66ceff3e24af GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l*kG2 z332W2?sl^?a z1H=FS|CN;fS7j#Z0_|l?@^*Jo)=J8;0&+MDJR*x37`TN&n2}-D90{Ocn5T!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tsc#Ex3 RZ)<>(44$rjF6*2UngCZ+R;K^} literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_9.png new file mode 100644 index 0000000000000000000000000000000000000000..ea7093bdc120b5b1ba36ddf14ea5632e8889ff0e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tsc*{ev ScV7V|89ZJ6T-G@yGywoz7*`em literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_0.png new file mode 100644 index 0000000000000000000000000000000000000000..91d03ca2f388de09457ef02c66e56a9ed9ca993f GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&ab8yIW07O-bp$NBMG~Bm-lTx4R2d8h1?!NJW81WHAE+w=f7ZGR&GI0Th(+ba4#f zxSpJ#z!Tx@%q$_n6d@xa!5WbmBg4QDo6odTecnMApgPqO*NBpo#FA92p00i_>zopr0M1oZ8vp!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&ab8yIW07?f-uUC8ht9@0Vu)#Tk>l-CdXkd3->&aTa()7Bet#3xhBt!>l&XcUJQ2>$%n}k!Q8E$|tx<_FGC=!knb(#|&u#>&Q!R0gC`m~yNwrEYN(E93 zMh1pPx`qb2MkXOfhE@iqK%{G6Vr5|PVB((>C>nC}Q!>*kach`(#-#+PK@em^T4qja fUSe*lRSA&6U>t9F*2VrkP?EvZ)z4*}Q$iB};sRJv literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_10.png new file mode 100644 index 0000000000000000000000000000000000000000..d7ef35be3d9df240a64f55b62d66c87b75e0e3a0 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE0y Tk;N(BfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE17 T<|QGCKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE0C T)>_uvKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alD~% U>?%{BzZn=jUHx3vIVCg!0G@7D<^TWy literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_14.png new file mode 100644 index 0000000000000000000000000000000000000000..4bd7c7f9586f4d19a047c3c503bae10757c67468 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE0) U;d2Y#0c9CHUHx3vIVCg!0JQ>FeE!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE1F TmXi}IfU*ppu6{1-oD!M=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-D+xTN)fCKP5+gY{s)J$>;y_NCV9KNu=Ho#3QL70(Y)*K0- zppvJHV+hCf}3G%uS3Tmw~EPOI#yL zQW8s2t&)pUffR$0fuWJEp@FWENr;i5m4PV`=^B_=85lg6_~!(QhTQy=%(P0}8YZ4` qDFJE_1lf?5nUk8An44-<0%R~4#~X$C=7j=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15~2Y< zA+Fus-D+xT|AE~9|5;wXWccwzN$LOQ%}T035ym8McNezAv>mlT4rhT!WHAE+w=f7Z zGR&GI0Tfj7ba4#fxSpJ_K!AgblS_-MDe?>-6O+TNi4(6n2!wW3Ffe5HGp;`2YXwrR zTH+c}l9E`GYL#4+3Zxi}3=EBQ4GnaSOhSwdtqe?oNY}u`%D~{k#6KrcH00)|WTsW( u)-dsmO9@beAjpQa%$(G`#N1S?5+H-YINn&!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&ab8yIW07?f-uUC8ht9@0Vu)#Tk>l-CdXkd3->&aTa()7Bet#3xhBt!>l&XcRIAt0HoHz`ab_QuTvfLJuIB3Dx+Q7&#RhZ?@z03uNfNE7sTq8hkfv%BBh>@X{fhiE_8kkra7(AHx=LCv|-29Zxv`X9>CZ2IA0csEg l*^ri*lbV;9n`%`8WH1=Vo9xv)odA?%@O1TaS?83{1OTH1Tblp? literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_5.png new file mode 100644 index 0000000000000000000000000000000000000000..601d67d01d295fde5f0ce8a9cf4fbd6e7696f45d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc+*pw SzrO(`89ZJ6T-G@yGywoyn^zG4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_6.png new file mode 100644 index 0000000000000000000000000000000000000000..b88ba52ba9e8fcb2bdc41d19226c7b1db0c81208 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc(Y)I RRX#vT22WQ%mvv4FO#nxwRhIw& literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_7.png new file mode 100644 index 0000000000000000000000000000000000000000..4f846e40136e84a53533f3b9db1423cbd66b02f7 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXcykr? RS+{_a44$rjF6*2UngC0MRqg-) literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_8.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad03d3052853f1bcd4f2c7c6280d89bbe15d9fd GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc#ADF R+P#6244$rjF6*2UngCMhR!#r_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_9.png new file mode 100644 index 0000000000000000000000000000000000000000..5b1ac9859a51e6508b84bd5c43b6383efae793e2 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc+11{ Sx8DUyGI+ZBxvX=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-T(jpXRu~q&}2|j`fv09^Hrb}W0JSK3rl~-%|IZBv%n*=n1O*?7=#%aX3dcR z3hH^fIEHXsPfk$aG~m+G*4Ac_Jag>Ov14osZJU&QjtHnN(pjU!AZBPLVxn-CiNX08 zOaHayZO4E*RZCnWN>UO_QmvAUQh^kMk%6I+uAzahkx7V=p_PFt5a}A2SQ!{RnE2-e ziiX_$l+3hB+!`jHaVY_65CqwfmYI{9mzbMsRRUx%n8X|G=aKvalw|O9^>bP0l+XkK D@jYXI literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8ad4791869eb24cffdcb92fcbb49dc201d94d114 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;168r%^ zA+Fus-3*!x4Au<)|NmD~`fp$#093-jnB?v5!qT5{GZ4t(EbxddW?! zC8<`)MX5lF!N|bSNY~In*T^Kq$k58b6o_;UOsotH9!&gm0!2e^eoAIqC2kE9&$yHT oH3))iNXyJg%}dNpwJHHJ7);^~PjG8y0VNqcUHx3vIVCg!00iP&b^rhX literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_10.png new file mode 100644 index 0000000000000000000000000000000000000000..801fc4f2365cfaf2c4ffacf6add812b150499fd1 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY#! TWJ!!4P?o{d)z4*}Q$iB}ofK8l literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_11.png new file mode 100644 index 0000000000000000000000000000000000000000..26d850b028bceea2e44327fc408d737f85d84cb8 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY$< TUUAM1pe%!@tDnm{r-UW|qDWRj literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_12.png new file mode 100644 index 0000000000000000000000000000000000000000..d96fca6b2be707307e9ff51a6e3dafec7d24e8c9 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY%a T_A1*Xpe%!@tDnm{r-UW|qQX`! literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_13.png new file mode 100644 index 0000000000000000000000000000000000000000..2e1c5139d721c176f2bb4fc9b02dc7c5d1006b3d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY%) Tfm+@#Kv@P)S3j3^P6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_14.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7b4d985bfdfbc26eaaaa9fef4b0b29f87ced28 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY#+ ToaBsfpe%!@tDnm{r-UW|oDfyT literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_15.png new file mode 100644 index 0000000000000000000000000000000000000000..a2aa5a7278124af601166854ce5a12de25fb608a GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY${ Trre5yKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&ab8yPM${ki(#)^gmhiB#6nFIABeIx*fm;}a85w5HkpK!Rdb&7< za9mGLaA59X)Hrg;lZVG=PPfAm9RWj5t+sW1Yz!}^vDr*MlkgO%Shd78q9i4;B-JXp zC>2OC7#SEE=^7g78kvL`8Cn^b0+FtPiIsuDgNc7mplHa=PsvQH#I0fC8J7~E20@Sw jX_+~xd5O8HRwY0NgGszmAXCK!pd^E*tDnm{r-UW|nOa%^ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_3.png new file mode 100644 index 0000000000000000000000000000000000000000..3ee463b966eddbef24b30f3927e5b5028f40a177 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&ab8yZaK5&A_0f^#7^gyOTf`W0JSK3$q}P56Cvo0*}aI1_o|n5N2eUHAey{sO#zC z7{YNqIl+N>jiQ5+$rVN?1HIUtO^upGuUHf|mN2#)-B6On9Kso42=vOyeC|UmKe}y! z8dXbNBT7;dOH!?pi&B9UgOP!uk*=YEu8~QIk)f4=DG=!zm{=JYJec_B1d4{-{FKbJ wO57SIo^dGwY7hk3kd~Q~nwOZHYE=ScFqp&}tFd~x0VNqcUHx3vIVCg!0LiFby#N3J literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_4.png new file mode 100644 index 0000000000000000000000000000000000000000..728760bbb438039f8b67ece667872a5de786e5d1 GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&ab8yIV==Kah9ExvvgLF(!GtyD#QQ#3-%)r1c48n{Iv*t(u1+6_@978y+ z`*s_0F(~jbuRr>Z&rZX?;01H-DqTG`A*Vx(Oly2nwhO4eou~Ftr_FdDhyCllYGx^d z{kpO9OIW;>g=NnIjZrOejVMV;EJ?LWE=mPb3`PcqM!JRux<)1;Mut`fra+`?U}9xp z@L=Mf6DS&T^HVa@DsgL=c*dm!s6h~9Lt17|YF=V)s#OV)!C(?^vLo^CQ=lY+r>mdK II;Vst0I(Be82|tP literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_5.png new file mode 100644 index 0000000000000000000000000000000000000000..45839fd4f27901cf20275fde60915b3a299c17cc GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc+>M~ SZ-EYFVDNPHb6Mw<&;$TkCRW1$ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_6.png new file mode 100644 index 0000000000000000000000000000000000000000..d4de37bfcfcfd17dc04e03c872fa016230850ebc GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc(btl RJtu*Z44$rjF6*2UngCPYR(Svb literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_7.png new file mode 100644 index 0000000000000000000000000000000000000000..aff9cd926d847221c0e63f729263ae50b273464d GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tccyq;! Ro_L@ngQu&X%Q~loCICn@Ripp_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_8.png new file mode 100644 index 0000000000000000000000000000000000000000..4e996426816a92a0bc3cf657dd56fc1783d83366 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc#DnK SC!PaJGI+ZBxvX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc*|oK S7DfOi89ZJ6T-G@yGywoviB`b? literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_0.png new file mode 100644 index 0000000000000000000000000000000000000000..551b96db37de8eb10cdd95c5f6cd8a5645d3b4da GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+Fus-R9=z$;rv}_4WGt`c3r=2M!$g&%huj!YC#t22`b_^#8$${oOzoW0JSK3%C6B zBL{#S&H|6fVg?3oVGw3ym^DWND462u;uyklJvkvEK|n+#g@MsAH91+JJMiSut4Dnr z8XZp@J$m=((WXX6mNOq5l00@b9N=MNdpOgfY8l&vi8jU0d{h;hm2cj-;jxl2BY=Iv zMMkq-iYA0#z2gc=-c3N>I0VPUZRBqmdIeZe1~eX1p{5hW>!C8<`)MX5lF!N|bS zNY~In*T^Kq$k58b6o_;UOsotH9!&gm0!2e^eoAIqC2kE9&$yHTH3))iNXyJg%}dNp cwJHHJ7);|0_MIy}4U}Z?boFyt=akR{0GddJZU6uP literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_1.png new file mode 100644 index 0000000000000000000000000000000000000000..49f9ebb4df30fdab89fdac02d95a4ce2c2d7163b GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+Fus-R9=z$;rv}_4WGt`UegikP~72&%huiCe~CBRK%d9^uMrB>M4-LnB?v5!YzOO z$N?aSv%n*=n1O*?7=#%aX3dcR3Z{9wIEHXsPfkck5D*bbVPJGjO->f*4m^4E=+Tgd zM#mGZEN3JnTw-GG#Kzp2AR(0CCe7Sj(B8e=yIpF6;GK&X7qX;mV3n4Z)>LKS^_TWo`3_b363vA0|XhqzZN-Iv{ALhHKHUXu_VcptHiBg;u)6`pawyZ4QZJ!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qDq T!xPrpKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qD~ TwDa71fwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qBk T|FI}`pe%!@tDnm{r-UW|nZZ?* literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_13.png new file mode 100644 index 0000000000000000000000000000000000000000..c371cf38144a85c69b396d052726d2ace976fd04 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qCv T#lftJKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qDy Tv!(xyfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qE7 U#6{=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+Fus-R9=z$;rv}_4WGt`UegikP~72&%n@B&mbly22`b_^xrw?_aPvQG0EHAghkfv%BBh>@X{fhiE_8kkra7(AHx=LCv|-29Zxv`X9>CZ2IA0csEg*^ri*lbV;9 dn`%`8WH6Y<8wDH?dJdFi@O1TaS?83{1ORMfe%k;5 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d3cac204b754714797fe56457dfe9baa7a0034e5 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15-I^c zA+Fus-R9=z$;rv}_4WGt`UegikP~5Ss%QAmz#t|j22`b_^#9V4qJKaZW0JSK3%C6B zBL{#S&H|6fVg?3oVGw3ym^DWND462u;uyklJvkvEK|n+#g@MsAH91+JJMiSuqenv; z8XZrtvYe5Sa5=zZu5ftoV&*dwSh{_Z69ndQE=ga-D0$F0{agr>(T%3w-rgxf4Qxvp zB{LHiU%uqnU(v3WK4{J6hn@uc$(av*MEWbsg}4#l%ynKdw{=lw|O9^>bP0l+XkKnbUs> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_4.png new file mode 100644 index 0000000000000000000000000000000000000000..9cf99cc4e59e91c6b0a5d0ee99b800b59527ae47 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15{dyn zA+Fus-R9=z$;rv}_4WT57!Djbps%klC&DNuCI(cZr1byZdcN5}7GsjPy9-ywg)d=1 z4rhT!WHAE+w=f7ZGR&GI0Tj&eba4#fxSpJlkRTu;lET2~n3|j{&>eX4=+UDg4ULW` zj_T?jJvyh+@rW)E9G%gqr{RZCnWN>UO_QmvAUQh^kMk%6I+ zuAzahkx7V=p_PFt5a}A2SQ!{RnE2-eiiX_$l+3hB+!`jHaVY_65CqwfmYI{9mzbMs bRRUx%n8uszT)h1fP?EvZ)z4*}Q$iB}Mu~#E literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_5.png new file mode 100644 index 0000000000000000000000000000000000000000..5faea9541d608609163dd336a3d4d6d89310e1fb GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15{dyn zA+Fus-R9=z$;rv}_4WGt`UegikP~72&%huiCI(cZr1XE)w7WnC17ni6y9-ywg)d=1 z4rhT!WHAE+w=f7ZGR&GI0Tj&jba4#fxSpJlkRTu;lET2~n3|j{&>eX4=+UDg4ULW` zSXs_UNVpu}F=u1@D5UT?`;_d+%cLL+$?k!|XVJR;u(O{I!Ie6@tn-`}; z^QDF!6SlUQ!V;G*HJBV`@nhp)=yG6a<6u}gS$x?Q(|i&aZpBT7;dOH!?pi&B9U zgOP!uk*=YEu8~QIk)f4=DG=!zm{=JYJec_B1d4{-{FKbJO57SIo^dGwY7hk3kd~Q~ gnwOZHYE=ScFqp=ho?FuH0+eL%boFyt=akR{0903k!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHc(d@e S*Zu(|89ZJ6T-G@yGywoxz*h(W literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_7.png new file mode 100644 index 0000000000000000000000000000000000000000..b23c250018010eb010fae7987df98b6a7730fbe6 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHcyonS R&oY3L44$rjF6*2UngCIDR!IN= literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_8.png new file mode 100644 index 0000000000000000000000000000000000000000..bd28242b4bbe3ad1670278f7afc37e8d8f169f13 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHc#939 SzkdQH89ZJ6T-G@yGywowPgd&y literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_9.png new file mode 100644 index 0000000000000000000000000000000000000000..e6ef05401d2a0138e8053c0d375cd9979e5ee8f1 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHc+2BL Rr}Kf544$rjF6*2UngCJ(Rz?5- literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_0.png new file mode 100644 index 0000000000000000000000000000000000000000..ce8aa530d69945f085c2f1894372b40772f2493b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c!ND1 SXD0zA89ZJ6T-G@yGywovm{!gJ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_1.png new file mode 100644 index 0000000000000000000000000000000000000000..d981ccec9df1bc43c28842ad46fc9828f9fccc9e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c*E2E Re_4Q%44$rjF6*2UngCX8R)+up literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_10.png new file mode 100644 index 0000000000000000000000000000000000000000..ce8f7ab87891e18f57097ad343a64fd46888ed52 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hda T=h`VpfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hcP TOVyHKpe%!@tDnm{r-UW|q=;5i literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_12.png new file mode 100644 index 0000000000000000000000000000000000000000..12b29e494424596838fe48ce732267cdb27a5669 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hc< TZ1Go+{~0`8{an^LB{Ts5smxZ* literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_13.png new file mode 100644 index 0000000000000000000000000000000000000000..832731fa5c3fba97fcc3d0be59aad84d10435fc6 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hcf TR>{$Npe%!@tDnm{r-UW|rn**w literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_14.png new file mode 100644 index 0000000000000000000000000000000000000000..0c2c6ce19442d1615534f3ca781da5a441bde46d GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hdi T7lD8~Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hcX Tvv`6RP?o{d)z4*}Q$iB}n!;74 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_2.png new file mode 100644 index 0000000000000000000000000000000000000000..340c29731b0c5812935049e053b78a8310aaf2b2 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c%z`U RHT!^)44$rjF6*2UngCO3R&M|R literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_3.png new file mode 100644 index 0000000000000000000000000000000000000000..4698d4385983c16e01e82bcc4ed881fcc32f013b GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&V?|zW!SMe;`ju>HovqA%}r1#w2fd7iK{oACPUF1s;*b3=G`DAk4@xYmNj^P|VZC zF@)oKasmV6#S0e#Y+SVBB1M=OqCW`OJ~IuT092t`;u=wsl30>zm0Xkxq!^4042^UR z4Rno6LW~Tp3`~JY*TBTez~I5eKPON$MSHb`Q literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_4.png new file mode 100644 index 0000000000000000000000000000000000000000..145baf3046180be3e30c5c569ab9bd98ecb23f65 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c$3{v RIlF<944$rjF6*2UngCQRR$~AF literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_5.png new file mode 100644 index 0000000000000000000000000000000000000000..f5baaafea67bb5f28f5336bc49ee882ea85ae582 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c+)eF REM!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c(c&g R8Owo^44$rjF6*2UngCShR)7Ei literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_7.png new file mode 100644 index 0000000000000000000000000000000000000000..355900626218c1e41a685751805b172ddd778b20 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+cypyU R5r#lX22WQ%mvv4FO#n*xRmlJV literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_8.png new file mode 100644 index 0000000000000000000000000000000000000000..e6c493a207a158be352d4d1a6b2fa58a2fdc1a2e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c#BQJ Rt_y&Y44$rjF6*2UngCC$RviEU literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_9.png new file mode 100644 index 0000000000000000000000000000000000000000..88b41a829d3b8adef10f7f2d0d852e7f91672e2f GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c*~<9 RrDi}$22WQ%mvv4FO#n_gRrmk^ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_0.png new file mode 100644 index 0000000000000000000000000000000000000000..50cd9b81e0271c7beef417abd052ad92407365aa GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc!RxO S%a;Nr89ZJ6T-G@yGywoq{8oPe literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c21340109364da04064199f5e268726c78048f47 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc*9e^ R(~W_W44$rjF6*2UngCB=Rt^9F literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_10.png new file mode 100644 index 0000000000000000000000000000000000000000..3d20299ef88f903842942540888e3eedb07324b8 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;4 T_rcE#fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;a T&9TE~Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;~ T(({vgfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;C T&l>ZcKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;i T^=fu~pe%!@tDnm{r-UW|n8j6p literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4bac0ee42374fd6f6e2ff4301ab44c21702a36a6 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc%xvK RW1T=r22WQ%mvv4FO#n`6RuljL literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_3.png new file mode 100644 index 0000000000000000000000000000000000000000..02772c08e64f59d13fbfd9af8ac4ad6f7acd5f3e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uncw-gk RZ}LD%22WQ%mvv4FO#n!`RjU91 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_4.png new file mode 100644 index 0000000000000000000000000000000000000000..915af8bafa624836fce8883adea05e61e6420be6 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc#~b~ R$$Nm344$rjF6*2UngCFCRxkhn literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_5.png new file mode 100644 index 0000000000000000000000000000000000000000..f508aa62b4dfdfe80f32db969d298382b1920aff GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc+;~A R!CF8`22WQ%mvv4FO#n#*Rhs|+ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_6.png new file mode 100644 index 0000000000000000000000000000000000000000..7329097517a83b4c36b69759b738bf7605df30a6 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc(V{q RrU^hv22WQ%mvv4FO#nj7RY3p% literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_7.png new file mode 100644 index 0000000000000000000000000000000000000000..5b1a33fda38c72f4b222111533ce2f7256cd31de GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uncynbv RBQ~HUgQu&X%Q~loCICCORJ;HH literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_8.png new file mode 100644 index 0000000000000000000000000000000000000000..6bf8b31ce549259563598f7abe6e8ed305de7eec GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc#F*w S^``?R89ZJ6T-G@yGywon$5uW7 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_9.png new file mode 100644 index 0000000000000000000000000000000000000000..1584355e27bcdd6d21e3d28fb953497bc226c538 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc*`Tx R!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc!O!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc*BE& R7x;jZ44$rjF6*2UngC3kRo(yq literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_10.png new file mode 100644 index 0000000000000000000000000000000000000000..a2622d01fe7c769c5f1ac1f8cef3158e35694074 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSb T@S?}xfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBS5 T%F@dTKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBTW T-!)CQfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSL T*Xm6^Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSj T$a(emKv@P)S3j3^P6 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_15.png new file mode 100644 index 0000000000000000000000000000000000000000..4939b0b5bc72750749a8bee2ac6a6e8e030ba9b1 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSD T@(J-upe%!@tDnm{r-UW|p{`aR literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_2.png new file mode 100644 index 0000000000000000000000000000000000000000..eb29b886380d9b06ca797783529e020786fa4420 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc%ul3 R#w|ce22WQ%mvv4FO#n)wRn!0g literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_3.png new file mode 100644 index 0000000000000000000000000000000000000000..fb83c41dcf725edeaa9ab398a9f038ba9dc93edb GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUcw>F} RjY>dC22WQ%mvv4FO#nl}RZ#!{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_4.png new file mode 100644 index 0000000000000000000000000000000000000000..6a3c5a27862e9d843fe2c9403c05d63012b38f21 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc$1CQ RDvdx%22WQ%mvv4FO#n`GRssM3 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_5.png new file mode 100644 index 0000000000000000000000000000000000000000..d37b1bf2bd226b1ea876ce0edfcb275af6c3484c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc++Dw RBH}!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc(eFY R*R?=N22WQ%mvv4FO#n?MRrvq_ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_7.png new file mode 100644 index 0000000000000000000000000000000000000000..2b0c02fbf2d9e116d00cc14eb92377903bf183b6 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUcyo=S RQfr_jgQu&X%Q~loCICioRek^f literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_8.png new file mode 100644 index 0000000000000000000000000000000000000000..598dcc5182d7a54b888b38bca01f0a7fca9342ab GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc#9op SGgbj589ZJ6T-G@yGywov!&b}y literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_9.png new file mode 100644 index 0000000000000000000000000000000000000000..cf466a1b7a9d43699bd347989e2a1478177a16c1 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc+2yr RB0yeZ@O1TaS?83{1OQZ_R$~AF literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_0.png new file mode 100644 index 0000000000000000000000000000000000000000..030b4a0b1f6c511466aee84b81c1c70a14ae3da1 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c!TX% Sy4C|F89ZJ6T-G@yGywox#8&bE literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e2d6199d5776a9e20b805d673d185428f7c1fb3e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c*6si ScUb}@89ZJ6T-G@yGywou_*S(5 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_10.png new file mode 100644 index 0000000000000000000000000000000000000000..cce6f65dbf142729a35dc77bbdb7cb01812956fe GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!m TYPpulKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!` T9my@Az+mun^>bP0l+XkKp?_8n literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_12.png new file mode 100644 index 0000000000000000000000000000000000000000..540445ba0f176fd938e95809e26ac33430bbb16f GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!0 TtH9I!Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!W Tk@!_jpe%!@tDnm{r-UW|nuS%W literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_14.png new file mode 100644 index 0000000000000000000000000000000000000000..cde147bdcf34862090116ecb92ee2ac598b99d21 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!u Tnqr48pe%!@tDnm{r-UW|q+wP~ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_15.png new file mode 100644 index 0000000000000000000000000000000000000000..c09b5acade4952e7e59c0a02f666e9ca0acae834 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS#3 T?UDi+pe%!@tDnm{r-UW|q!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c%#T$ RubY9A44$rjF6*2UngCgHR?z?e literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_3.png new file mode 100644 index 0000000000000000000000000000000000000000..c4c5cc66add048302b9ee3a351f49b4bc07baa8e GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9cw@c0 Rw?%=H44$rjF6*2UngCFWRxAJj literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_4.png new file mode 100644 index 0000000000000000000000000000000000000000..5e55c92141eada308b01db06d4d6753ad0bdb90b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c#{n~ S{k8!m89ZJ6T-G@yGywot7FM4C literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_5.png new file mode 100644 index 0000000000000000000000000000000000000000..4d8a43f77c76a078461d3b271e468fe61a34bb0c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c+=zi R>J)&I44$rjF6*2UngCPeR#pH2 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_6.png new file mode 100644 index 0000000000000000000000000000000000000000..8435594951fbd4d9358b669d24165c2dd44df82b GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c(b_e R`m=zN44$rjF6*2UngCARRuTXJ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_7.png new file mode 100644 index 0000000000000000000000000000000000000000..8a872b5ae3aafabf93675f3d3ff52931e56b4dd9 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9cyrAS R@;pFE22WQ%mvv4FO#nk4RXG3v literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_8.png new file mode 100644 index 0000000000000000000000000000000000000000..3314e05bcccc2e8ceb34209092276922d470d878 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c#EC< ROml&f44$rjF6*2UngB?LRh<9; literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_9.png new file mode 100644 index 0000000000000000000000000000000000000000..69f75ceb8debef7f7672a9b526692d47b0874320 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c*}Df RM%+M222WQ%mvv4FO#no-RZ0K= literal 0 HcmV?d00001 From 263b0068b9ed28c9b7b15c9c937427fce76c7645 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 9 Mar 2013 17:47:40 +0100 Subject: [PATCH 08/93] Moved GuiIcons and Triggers to subfolders Cleaned up icons for items and textures --- .../buildcraft/textures/blocks/block_0_13.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_0_14.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_0_15.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_0.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_1.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_10.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_10_11.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_10_12.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_10_13.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_10_14.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_10_15.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_10_2.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_3.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_4.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_5.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_6.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_7.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_8.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_10_9.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_0.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_1.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_10.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_11_11.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_11_12.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_11_13.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_11_14.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_11_15.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_11_2.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_3.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_4.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_5.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_6.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_7.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_8.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_11_9.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_0.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_1.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_10.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_12_11.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_12_12.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_12_2.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_3.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_4.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_5.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_6.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_7.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_8.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_12_9.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_0.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_1.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_10.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_13_11.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_13_12.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_13_13.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_13_2.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_3.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_4.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_5.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_6.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_7.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_8.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_13_9.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_0.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_1.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_10.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_14_11.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_14_12.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_14_13.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_14_14.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_14_15.png | Bin 369 -> 0 bytes .../buildcraft/textures/blocks/block_14_2.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_3.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_4.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_5.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_6.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_7.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_8.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_14_9.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_3_12.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_3_13.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_4_10.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_4_11.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_4_12.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_4_13.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_4_14.png | Bin 368 -> 0 bytes .../buildcraft/textures/blocks/block_4_15.png | Bin 368 -> 0 bytes .../mods/buildcraft/textures/blocks/block_4_9.png | Bin 367 -> 0 bytes .../mods/buildcraft/textures/items/block_0_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_0_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_0_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_0_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_0_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_0_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_0_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_0_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_0_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_0_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_0_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_0_9.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_10_0.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/block_10_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_10_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_10_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_10_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_10_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_10_15.png | Bin 331 -> 0 bytes .../mods/buildcraft/textures/items/block_10_2.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_3.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_4.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_5.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_6.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_7.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_8.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_10_9.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_0.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/block_11_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_11_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_11_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_11_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_11_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_11_15.png | Bin 331 -> 0 bytes .../mods/buildcraft/textures/items/block_11_2.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_3.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_4.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_5.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_6.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_7.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_8.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_11_9.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_0.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/block_12_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_12_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_12_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_12_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_12_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_12_15.png | Bin 331 -> 0 bytes .../mods/buildcraft/textures/items/block_12_2.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_3.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_4.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_5.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_6.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_7.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_8.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_12_9.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_0.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/block_13_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_13_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_13_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_13_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_13_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_13_15.png | Bin 331 -> 0 bytes .../mods/buildcraft/textures/items/block_13_2.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_3.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_4.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_5.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_6.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_7.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_8.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_13_9.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_0.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/block_14_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_14_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_14_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_14_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_14_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_14_15.png | Bin 331 -> 0 bytes .../mods/buildcraft/textures/items/block_14_2.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_3.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_4.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_5.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_6.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_7.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_8.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_14_9.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_0.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/block_15_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_15_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_15_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_15_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_15_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/block_15_15.png | Bin 331 -> 0 bytes .../mods/buildcraft/textures/items/block_15_2.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_3.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_4.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_5.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_6.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_7.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_8.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_15_9.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_1_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_1_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_1_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_1_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_1_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_1_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_1_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_1_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_1_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_1_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_1_9.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_2_0.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_2_1.png | Bin 471 -> 0 bytes .../mods/buildcraft/textures/items/block_2_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_2_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_2_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_2_2.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_2_3.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_2_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_2_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_3_1.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_3_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_3_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_3_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_3_2.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_3_3.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_3_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_3_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_4_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_4_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_4_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_4_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_4_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_4_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_4_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_4_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_4_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_4_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_4_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_4_9.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_5_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_5_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_5_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_5_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_5_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_5_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_5_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_5_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_5_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_5_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_5_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_5_9.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_6_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_6_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_6_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_6_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_6_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_6_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_6_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_6_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_6_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_6_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_6_9.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_0.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_1.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_7_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_7_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_7_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_7_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_7_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_7_2.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_3.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_7_9.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_0.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_1.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_8_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_8_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_8_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_8_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_8_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_8_2.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_3.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_8_9.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_0.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_1.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_10.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_9_11.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_9_12.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_9_13.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_9_14.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_9_15.png | Bin 330 -> 0 bytes .../mods/buildcraft/textures/items/block_9_2.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_3.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_4.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_5.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_6.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_7.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_8.png | Bin 329 -> 0 bytes .../mods/buildcraft/textures/items/block_9_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_0_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_0_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_0_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_0_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_0_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_0_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_0_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_0_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_0_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_0_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_0_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_10_0.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_10_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_10_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_10_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_10_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_10_15.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_10_2.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_3.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_4.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_5.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_6.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_7.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_8.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_10_9.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_0.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_11_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_11_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_11_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_11_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_11_15.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_11_2.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_3.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_4.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_5.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_6.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_7.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_8.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_11_9.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_0.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_12_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_12_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_12_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_12_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_12_15.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_12_2.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_3.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_4.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_5.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_6.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_7.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_8.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_12_9.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_0.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_13_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_13_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_13_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_13_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_13_15.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_13_2.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_3.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_4.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_5.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_6.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_7.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_8.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_13_9.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_0.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_14_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_14_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_14_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_14_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_14_15.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_14_2.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_3.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_4.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_5.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_6.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_7.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_8.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_14_9.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_0.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_1.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_10.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_15_11.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_15_12.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_15_13.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_15_14.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_15_15.png | Bin 331 -> 0 bytes .../buildcraft/textures/items/guiicons_15_2.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_3.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_4.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_5.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_6.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_7.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_8.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_15_9.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_1_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_1_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_1_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_1_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_1_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_1_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_1_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_1_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_2_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_2_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_2_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_2_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_2_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_2_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_2_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_3_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_3_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_3_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_3_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_3_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_3_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_3_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_4_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_4_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_4_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_4_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_4_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_4_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_4_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_5_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_5_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_5_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_5_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_5_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_5_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_5_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_6_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_6_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_6_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_6_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_6_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_6_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_6_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_7_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_7_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_7_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_7_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_7_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_7_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_7_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_8_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_8_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_8_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_8_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_8_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_8_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_8_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_1.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_10.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_9_11.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_9_12.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_9_13.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_9_14.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_9_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guiicons_9_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guiicons_9_9.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_0_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_0_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_0_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_0_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_0_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_0_15.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_0.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_1.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_10.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_10_11.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_10_12.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_10_13.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_10_14.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_10_15.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_10_2.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_3.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_4.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_5.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_6.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_7.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_8.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_10_9.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_0.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_1.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_10.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_11_11.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_11_12.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_11_13.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_11_14.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_11_15.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_11_2.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_3.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_4.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_5.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_6.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_7.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_8.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_11_9.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_0.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_1.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_10.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_12_11.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_12_12.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_12_13.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_12_14.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_12_15.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_12_2.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_3.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_4.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_5.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_6.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_7.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_8.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_12_9.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_0.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_1.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_10.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_13_11.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_13_12.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_13_13.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_13_14.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_13_15.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_13_2.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_3.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_4.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_5.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_6.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_7.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_8.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_13_9.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_0.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_1.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_10.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_14_11.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_14_12.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_14_13.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_14_14.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_14_15.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_14_2.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_3.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_4.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_5.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_6.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_7.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_8.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_14_9.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_0.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_1.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_10.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_15_11.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_15_12.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_15_13.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_15_14.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_15_15.png | Bin 331 -> 0 bytes .../textures/items/guitriggers_15_2.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_3.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_4.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_5.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_6.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_7.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_8.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_15_9.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_1_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_1_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_1_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_1_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_1_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_1_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_1_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_1_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_1_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_1_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_1_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_1_9.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_2_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_2_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_2_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_2_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_2_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_2_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_2_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_2_9.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_3_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_3_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_3_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_3_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_3_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_3_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_3_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_3_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_3_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_3_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_3_9.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_4_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_4_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_4_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_4_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_4_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_4_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_4_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_4_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_4_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_4_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_4_9.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_5_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_5_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_5_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_5_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_5_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_5_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_5_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_5_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_5_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_5_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_1.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_6_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_6_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_6_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_6_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_6_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_6_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_3.png | Bin 337 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_6_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_1.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_7_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_7_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_7_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_7_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_7_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_7_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_7_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_1.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_8_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_8_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_8_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_8_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_8_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_8_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_8_9.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_0.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_1.png | Bin 329 -> 0 bytes .../textures/items/guitriggers_9_10.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_9_11.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_9_12.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_9_13.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_9_14.png | Bin 330 -> 0 bytes .../textures/items/guitriggers_9_15.png | Bin 330 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_2.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_3.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_4.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_5.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_6.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_7.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_8.png | Bin 329 -> 0 bytes .../buildcraft/textures/items/guitriggers_9_9.png | Bin 329 -> 0 bytes .../textures/items/{ => icons}/guiicons_0_0.png | Bin .../textures/items/{ => icons}/guiicons_0_1.png | Bin .../textures/items/{ => icons}/guiicons_0_2.png | Bin .../textures/items/{ => icons}/guiicons_0_3.png | Bin .../textures/items/{ => icons}/guiicons_0_4.png | Bin .../items/{ => triggers}/guitriggers_0_0.png | Bin .../items/{ => triggers}/guitriggers_0_1.png | Bin .../items/{ => triggers}/guitriggers_0_2.png | Bin .../items/{ => triggers}/guitriggers_0_3.png | Bin .../items/{ => triggers}/guitriggers_0_4.png | Bin .../items/{ => triggers}/guitriggers_0_5.png | Bin .../items/{ => triggers}/guitriggers_0_6.png | Bin .../items/{ => triggers}/guitriggers_0_7.png | Bin .../items/{ => triggers}/guitriggers_0_8.png | Bin .../items/{ => triggers}/guitriggers_0_9.png | Bin .../items/{ => triggers}/guitriggers_1_0.png | Bin .../items/{ => triggers}/guitriggers_1_1.png | Bin .../items/{ => triggers}/guitriggers_1_2.png | Bin .../items/{ => triggers}/guitriggers_1_3.png | Bin .../items/{ => triggers}/guitriggers_2_0.png | Bin .../items/{ => triggers}/guitriggers_2_1.png | Bin .../items/{ => triggers}/guitriggers_2_2.png | Bin .../items/{ => triggers}/guitriggers_2_3.png | Bin .../items/{ => triggers}/guitriggers_2_4.png | Bin .../items/{ => triggers}/guitriggers_2_5.png | Bin .../items/{ => triggers}/guitriggers_2_6.png | Bin .../items/{ => triggers}/guitriggers_2_7.png | Bin .../items/{ => triggers}/guitriggers_3_0.png | Bin .../items/{ => triggers}/guitriggers_3_1.png | Bin .../items/{ => triggers}/guitriggers_3_2.png | Bin .../items/{ => triggers}/guitriggers_3_3.png | Bin .../items/{ => triggers}/guitriggers_3_4.png | Bin .../items/{ => triggers}/guitriggers_4_0.png | Bin .../items/{ => triggers}/guitriggers_4_1.png | Bin .../items/{ => triggers}/guitriggers_4_2.png | Bin .../items/{ => triggers}/guitriggers_4_3.png | Bin .../items/{ => triggers}/guitriggers_4_4.png | Bin .../items/{ => triggers}/guitriggers_5_0.png | Bin .../items/{ => triggers}/guitriggers_5_1.png | Bin .../items/{ => triggers}/guitriggers_5_2.png | Bin .../items/{ => triggers}/guitriggers_5_3.png | Bin .../items/{ => triggers}/guitriggers_5_4.png | Bin .../items/{ => triggers}/guitriggers_5_5.png | Bin 818 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_0_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_10_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_11_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_12_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_13_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_14_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_3_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/block_4_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_0_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_10_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_11_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_12_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_13_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_14_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_15_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_1_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_2_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_4_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_5_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_6_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_7_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_8_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_9_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_9.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_0.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_1.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_10.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_11.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_12.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_13.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_14.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_15.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_2.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_3.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_4.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_5.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_6.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_7.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_8.png delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_9.png rename buildcraft_resources/mods/buildcraft/textures/items/{ => icons}/guiicons_0_0.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => icons}/guiicons_0_1.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => icons}/guiicons_0_2.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => icons}/guiicons_0_3.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => icons}/guiicons_0_4.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_0.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_1.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_2.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_3.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_4.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_5.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_6.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_7.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_8.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_0_9.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_1_0.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_1_1.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_1_2.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_1_3.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_0.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_1.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_2.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_3.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_4.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_5.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_6.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_2_7.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_3_0.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_3_1.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_3_2.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_3_3.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_3_4.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_4_0.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_4_1.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_4_2.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_4_3.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_4_4.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_5_0.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_5_1.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_5_2.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_5_3.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_5_4.png (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{ => triggers}/guitriggers_5_5.png (100%) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_13.png deleted file mode 100644 index 85880bcf98900173531737dcd5c390e9784e48fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_Ox BWitQ( diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_0_14.png deleted file mode 100644 index e340ceb06a2fda6b95c1c6ae57d8f3a939abbf86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_>& BWq|+y diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_0.png deleted file mode 100644 index c55bf914f371f147ab3255d02e7aed99f79e28e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`JQ BWwQVP diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_10.png deleted file mode 100644 index 6a5e23637827541c3008f8d3a25e8750bd90f948..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9&t;ucLK6TZ Csb)d| diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_15.png deleted file mode 100644 index 3dc1de944fbd7abe3be6bcf94233458b615c39f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9mdKI;Vst0G)DW ARsaA1 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_4.png deleted file mode 100644 index c732e93d73ae2754db00bf4c4cb418151f11de59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_=` BWq$ww diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_5.png deleted file mode 100644 index d86028214c2a295ac827ce2fc3a1ced5ca7322e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`qZ BW$gd} diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_8.png deleted file mode 100644 index c2b8447ec3e195da251c9ce3aa65e88a7e06238f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>{YH BW>EkD diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_10_9.png deleted file mode 100644 index 2340f733ee8539eb833ad80f0b92a49336ecb35e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>__X BWrY9$ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_1.png deleted file mode 100644 index 882793a22f49eb7b1d30d92eba357624c6afdd4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9KLZB)JPgg&ebxsLQ0K1@N A<^TWy diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_10.png deleted file mode 100644 index 34dd4f74542d1180e3b6aea37a48a9b78fd116e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9&t;ucLK6To C)@F+U diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_13.png deleted file mode 100644 index 21ece3cfc1dd84a8c46178651ebb6f2c04d41c56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9jg>l$HWX2j{1ilqVLYG6W=M=9TFAxrQi|8S9zq85$UTDOw0r#o+1c=d#Wzp$PyF CqGj9w diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_14.png deleted file mode 100644 index 235d13d8cc962020fdd5b606e32d4418aafa2497..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9&t;ucLK6Td Cv}RcV diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_15.png deleted file mode 100644 index 2a47e2c74cb7cba317ed13eaa5aa6f6d765933ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_`K BWsLv; diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_4.png deleted file mode 100644 index 0a112762b5d28b887836883c2f9b5ee3580b9081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCII-% BXAuAZ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_6.png deleted file mode 100644 index 4f03d839f7b25fc710bf08090d0a0b6e71c4ffa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9Rql>*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`P) BWxD_X diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_7.png deleted file mode 100644 index ef83a6eda70df81d7766deadcae2fe7fd1f4b3ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIF{T BWqtqv diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_11_9.png deleted file mode 100644 index 519fa596d66efb8b0fd4aa19c157a1af9a3c9fa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9zopr0Hru( Ab^rhX diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_3.png deleted file mode 100644 index 2415a9e8ce9ac5c3c7a155fd91b8dc66fa9599b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9Bl>*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`ah BWyk;k diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_12_5.png deleted file mode 100644 index b8dabe6dffb2fd8d08b764cd9d59d3bb8ecaca9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_tR BWnKUP diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_1.png deleted file mode 100644 index 42efb02cb46e7724b9e3c934b6013a5907359df2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`Nk BWw`(V diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_10.png deleted file mode 100644 index 60533c02794dafb22448db85e2bc02ee94a9510c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ96E diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_2.png deleted file mode 100644 index b9187b26b75b5f26ea5be68a7bec8fc017065c46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9LQ!N`Yj9^V3So6N^$A0unRxO7#3(Llnx4^-T2)4Gg{%Ed;7!@O1TaS?83{1OSXk BWcL67 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_5.png deleted file mode 100644 index 9afbb14a36e84e0ae29ff0b9f77a23f349f9de58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_#l BWo`ff diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_6.png deleted file mode 100644 index f39e7d03eef5b9fb0d6da709314cabded33a290a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ976Mf diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_7.png deleted file mode 100644 index c90445e3fdd8051c012e38ceb0a93952cff16432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ90l>*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`CO BWuE{5 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_13_9.png deleted file mode 100644 index 70ec0a99fec13615821a6b03eab32af3b9f617f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_?n BWq|+y diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_10.png deleted file mode 100644 index 1fcc4ca132532d4baba048e0332cce4fb6f81413..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIAo$ BW#Iq- diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_12.png deleted file mode 100644 index 7dafd3163365c4b1afbfe62bd8c8b2fbec2822e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9N=t#HgY(l$$`gxH83GbB^GfvmTtgJfjP*?Q3=Isv6fFd*V(@hJb6Mw<&;$VE C;bjj1 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_15.png deleted file mode 100644 index ea24f4d81f6e53f883001ed59234987e4f0b67ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_@2 BWr+X) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_3.png deleted file mode 100644 index 9ff58af10bf1d85694c3a52bc9036c5913a40045..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ976Mf!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`tm BW$6F_ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_14_9.png deleted file mode 100644 index c03669f9b43c3182fbf40dbedb655b979d02c3ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIF*Q BWoiHb diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_12.png deleted file mode 100644 index 9eb65878252aa695ec4c46c45dd7bbdce14939f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_Xn BWkCP{ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_13.png deleted file mode 100644 index 83647bde1f66a4b549b076091b2cf8ec9486e5fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9-L15RjOeSEA?V8lq5UtY@lcXkhTAXdzG)gQu&X%Q~loCIFFM BWfTAa diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_10.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_10.png deleted file mode 100644 index f7ba365f20700cbb0a8fe314f54606afa5be11fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ976Mf!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>`ZE BWy$~m diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_14.png deleted file mode 100644 index c1753b1eb1b99afc7aebe448277a8d5c39706a6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9*5I=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_Ui BWj+7^ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_9.png b/buildcraft_resources/mods/buildcraft/textures/blocks/block_4_9.png deleted file mode 100644 index 1f15302b299f641bf7b823f92476aa022faccdf7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G+y1@c;k- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_13.png deleted file mode 100644 index ff5d5091c0dfb7e3c384794cb88c726f9e316050..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLur>mdKI;Vst0HO|59{>OV diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_15.png deleted file mode 100644 index 39a7fb531a609b856066bfd34451a26c43b5c176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu9QL8X+T*9Pgg&ebxsLQ0I9rGyZ`_I diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_4.png deleted file mode 100644 index ac24143bed0757c783e63b17eca85401ebac0d45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu T{)|#fpd^E*tDnm{r-UW|RYg>1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_0_5.png deleted file mode 100644 index 2d71270448640f1b84ef766a7f71733d096e94c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0I0K6qW}N^ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_10_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_10_1.png deleted file mode 100644 index 1807683547a7d31212e28baa483643ba4a8d722c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0IY3P`2YX_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_10_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_10_6.png deleted file mode 100644 index e9115c40a69bfa209b8ca5727fece000c6468089..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu7TA(b0r>mdKI;Vst0HtG8fdBvi diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_10_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_10_7.png deleted file mode 100644 index fb91699ffb6603cd89d6018cf46d8333190a89c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0Jq###Q*>R diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_0.png deleted file mode 100644 index 69e5b94f473c60df45df77ad797c29a26211a2db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0Qf{ytpET3 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_11.png deleted file mode 100644 index bebc2f78bb77e5dffab029830f437ecb95d458be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu#*M2~022WQ%mvv4FO#lLaRaF20 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_2.png deleted file mode 100644 index 2e62e859fb0fe2f60ff9f53dad4ae25f325a9835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu%vvV4y66r>mdKI;Vst0HYODPXGV_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_3.png deleted file mode 100644 index 24a2b30f6491c53f7799634f46bbc5774ce1f056..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JsZPvj6}9 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_5.png deleted file mode 100644 index 042e9af6684ccb02eb9144af09dfe803b69aedcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuGJPCJ^*DIJYD@<);T3K0RX?3R!jf@ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_6.png deleted file mode 100644 index 14acc6e5780b8e964bd6033a26e766e49ba550b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JFhWe*gdg diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_11_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_11_8.png deleted file mode 100644 index 8d831e86b4608f3b094307f228d73505dc15b327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0I=9qNB{r; diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_0.png deleted file mode 100644 index 3452d3912fa02299180832b203c73494b99ddf4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JF_ia{vGU diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_10.png deleted file mode 100644 index 3737a6228916c8649a935fe7328221a974bafa65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuRIva6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_13.png deleted file mode 100644 index d5fecb604dc83e1afd78b5fb033a90274bc86c6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLub%7 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_3.png deleted file mode 100644 index cc9cc238b218bf94144de69b05604ba9680aa3a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J1|>VgLXD diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_4.png deleted file mode 100644 index 5eec47c7ec13bbaf78e3fd56dc30b1a9fc7f924f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuC%mED}k~Mp00i_>zopr0InHT3;+NC diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_6.png deleted file mode 100644 index 67ceeafc391b1226ae659c63e61bc9e5d9bac800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu|JYD@<);T3K0RWxTQ|15w diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_7.png deleted file mode 100644 index 102fb0c6b07b72e9b222716a7119770a0454d661..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0Hx!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G||7^8f$< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_12_9.png b/buildcraft_resources/mods/buildcraft/textures/items/block_12_9.png deleted file mode 100644 index 1c29d04e6383d4e498bb702b0c2d51b434b856d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H2gp3IG5A diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_0.png deleted file mode 100644 index e173f6e5ca7e54f4d75fb98b26b7b9a4ef78ea38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLus~-<22WQ%mvv4FO#lIzRY3p% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_11.png deleted file mode 100644 index d5620bedadd47f57e3f6e03280246e407fcb142e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G|<53;+NC diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_3.png deleted file mode 100644 index 0c6f9d0b125a50af029cd89eaa9a8f74b578fda4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HWViR{#J2 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_4.png deleted file mode 100644 index 48eeb610ded2ddb5edb4ab2ad4cd5dc18fd8f2c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLukCm4xlW9r>mdKI;Vst0HW_yG5`Po diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_5.png deleted file mode 100644 index 325489d794273773dae85625f5541f1e455aa4a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu5^idc|chPPgg&ebxsLQ0H}XdsQ>@~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_6.png deleted file mode 100644 index 3b9a74eb15979a446202c7cbee19f833fcdadd06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H$eFkN^Mx diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_13_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_13_8.png deleted file mode 100644 index d7720ac079cde7452fc70674f6133fc985a0066b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J0=iQvd(} diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_0.png deleted file mode 100644 index 1a200527caa835523457980d03004893f1dcce6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U!Nst1Q-HDzp00i_>zopr0I{@HO#lD@ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_1.png deleted file mode 100644 index e251b76bdc7d2b0bab96f2c7ad2050dd5881003a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U;j+MgOh8!%Pgg&ebxsLQ0IC2~yZ`_I diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_10.png deleted file mode 100644 index bc1e067009e778dfcec28e049cdc9af2e60dcc0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp@CHK`_DjW22WQ%mvv4FO#lJoRb>DG diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_11.png deleted file mode 100644 index d1dc8408a6aad66f262b2ef5cf5cd9eeff4473fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vq0yJxzWYFF22WQ%mvv4FO#lh$Rn`Ci diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_13.png deleted file mode 100644 index cd4aa5d5baea924be28d60decf4ba5178e79ae9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp>cE7K2M-DgQu&X%Q~loCIJ1gRQ&(| diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_14.png deleted file mode 100644 index 1d2a8224d58dd1c1295893ea298610f7c6c4981b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Vp^2=V_A8(?gQu&X%Q~loCIIpvR7wB< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_15.png deleted file mode 100644 index 03bfb5791959dfd60fe0e0cfe177fbbc1d2cac0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Up=p++G{`&#Pgg&ebxsLQ0PsLm6#xJL diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_2.png deleted file mode 100644 index 933bd3e44e285befd9ff8d3fcdb11562f8e2cd27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Uk$uGa9Y9$IPgg&ebxsLQ0I2p!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh Uu}A!TJ)kUur>mdKI;Vst0HPjLI{*Lx diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_4.png deleted file mode 100644 index 0600188179cf1fc06931c3983fa3d70ec8ec600f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U$u(=PUZ5<4r>mdKI;Vst0HvT*Z~y=R diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_5.png deleted file mode 100644 index d7e04dc7c01692c2c84f539a4e92685e0fbf03ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U=|USTX`n2Fr>mdKI;Vst0G~!v`v3p{ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_6.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_6.png deleted file mode 100644 index b65418eff2d5fd5fbd748906715298e478265de1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh UnT2WgLZB>zr>mdKI;Vst0HNAcLjV8( diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_7.png deleted file mode 100644 index 69b66497017c3daab97260cc7f4c831441cbc750..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh UxxZ1gIZ&3t)78&qol`;+0G#Yo-T(jq diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_14_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_14_8.png deleted file mode 100644 index a3badb4628efe899db7977ab3c6abc81a96cc33b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh U#r!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuh V<%+H{pdT3+JYD@<);T3K0RX7wRHXm_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_0.png deleted file mode 100644 index 7ab3e8cdfcdf1e13af715fad337150ae4ecc0f44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu V!G$SH76WA&JYD@<);T3K0RXemRd4_R diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_1.png deleted file mode 100644 index 64ec572a0e0577bea3b9a2486a0aee258fddff5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U;qu8-Oo6ftp00i_>zopr0IJMX$p8QV diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_10.png deleted file mode 100644 index df9f70fc3ecfdb51b6dc52685cff9afc16888667..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp~0f_9n*l)44$rjF6*2Ung9iWRfYfn diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_11.png deleted file mode 100644 index cde3825511fe3af1ca3c7b9f73aaaf1f3a37cda1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vq2bjNJAkqb44$rjF6*2Ung9b@RZRc@ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_12.png deleted file mode 100644 index 8022cc13b57a730fd356afaebb755f8d8193b167..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp^?wQm%D({44$rjF6*2Ung9lpRjB{~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_13.png deleted file mode 100644 index 7a16d1a563d5ebaf8074625880bc96af6078568c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp|SO`n>s*g22WQ%mvv4FO#uD5RR910 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_14.png deleted file mode 100644 index 4e9918ee972237d2672bcaed606d19781a24f5a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vp~=!kKK(#x22WQ%mvv4FO#uI&RUH5T diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_15.png deleted file mode 100644 index 0ac7acd8614ea272d7e02fd1f234246843ef15ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Vq3NZiHIhJS22WQ%mvv4FO#uH-RR{n8 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_2.png deleted file mode 100644 index c5c52102a976005096f6f791357eae5d9b3eeef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Uk=?AL{Xkg;Pgg&ebxsLQ0IT*?^8f$< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_3.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_3.png deleted file mode 100644 index 4c5623842e108975607ba1112d09c8a2a42abedd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UvFF^cl0aDoPgg&ebxsLQ0I7ylyZ`_I diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_4.png deleted file mode 100644 index 3c5c29cef9a47d97af649d90b0900b3325bd6890..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U$@QNJyMVF`p00i_>zopr0Jq{*vj6}9 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_5.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_5.png deleted file mode 100644 index 8d0665e26259fe9270bb8dbce9bf4f19bf4266d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U>4JX&IzU+lPgg&ebxsLQ0IaxF!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UndNuJX+T*9Pgg&ebxsLQ0H**{k^lez diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_7.png deleted file mode 100644 index 63055773dc4442060b80251ff65c8761d27dd0a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Ux!(svpdr>mdKI;Vst0HXR-I{*Lx diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_8.png deleted file mode 100644 index 07543e95eed1213c69dec082e25251fd379ff748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U#XWzWi9lHfPgg&ebxsLQ0I9Q7w*UYD diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_15_9.png b/buildcraft_resources/mods/buildcraft/textures/items/block_15_9.png deleted file mode 100644 index 40be66f53bd8ac2219f719354c81d0e7ec746f1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UmdKI;Vst0G=sR;s5{u diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_10.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_10.png deleted file mode 100644 index 269781bf5881637d88befbfe8909361071c2e006..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0Ic;@4gdfE diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_12.png deleted file mode 100644 index 9ea6c05e6a73f1c7187268b561c1265396da3512..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuPgg&ebxsLQ0Ikba1ONa4 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_13.png deleted file mode 100644 index bceaf725d0c58ca293fcf7d2a6c4ad38f1b5c8b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IC&K!T!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu+#8pd^E*tDnm{r-UW|QDIam diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_7.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_7.png deleted file mode 100644 index 7c1e5580a08085b16a80932b9415a58a9092725b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu| diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_8.png b/buildcraft_resources/mods/buildcraft/textures/items/block_1_8.png deleted file mode 100644 index ee373f1285121324e115c4481ad916db84aa1a40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;164C)a zA+9FD`V9NGX4}_atN-6}qBx}8H@Qtu$&@vpfnlc9wmU#&Y$ZW{!9W@a@|Lkr1X7Gi z-tI0OZTF^D0Xdun9+AZi4BWyX%*Zfnjs#G!+SA1`gyXvISwpVF1_CY@1I;>bg+AWG z81JxQL5#x#;T_=ykz36e-+t9qe^>W$2IGP0%b6V}y518pw%GgM1lBT7;dOH!?pi&B9UgOP!uk*=YEu8~QIk)f4=sg;3=u7Qb_ zfq~nz?=>hIa`RI%(<*UmFyHNe0H{F_WJ6kJPHJ9aZmLxYkilRSZ+NCH^afCp!PC{x JWt~$(69D!$muUb1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_13.png deleted file mode 100644 index d5352aeb513d5feb4b31567cbd1ae9d48d7d8d05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HZ8aIsgCw diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_14.png deleted file mode 100644 index 199011acd2c17bf511b03e02734cea1515f82e3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IhCS1poj5 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_15.png deleted file mode 100644 index 9af142fea6e7ede1ebebd10f433f685ec45be71f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HelKTmS$7 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_2_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_2_2.png deleted file mode 100644 index 3f785c7f490b9f377e7b3e99669fe5f7d260c341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuDLnv0wozdUHx3vIVCg!0A^WLod5s; diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_1.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_1.png deleted file mode 100644 index 13038d86354ee150ead4d4d0d425da94c259eca2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuDPg-T`G9JYD@<);T3K0RXy7RptNy diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_15.png deleted file mode 100644 index 9627293d160659eb3b5484d32e5f114c874c3d02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu6VidDuA*Kp00i_>zopr0J1|>O#lD@ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_2.png deleted file mode 100644 index ea121f7a2c4a4f2702fec12a10098b779babf41c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H={ussI20 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_12.png deleted file mode 100644 index 57a4cfc992921f038e57ed692799c0a500ef1e74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H_O8mH+?% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_13.png deleted file mode 100644 index ed199a19924bc6a099127dbbecb2c06973614d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0HIk_E&u=k diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_15.png deleted file mode 100644 index 0aa3557510254138c2e116d4f5e409da3a852b96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuc>n+a diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_4_4.png deleted file mode 100644 index afdf5d014184a88153065fe3c1cb9ed310101115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuNl9fszcKu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U!NU{Q+CW(bPgg&ebxsLQ0IWz<)Bpeg diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_11.png deleted file mode 100644 index bd06d3081aab919a33e2709f8b6551ba26019641..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U;k5JIdx5eHp00i_>zopr0Ib|p^8f$< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_12.png deleted file mode 100644 index f1dc5bce77a77231f97e7e83a2f479668ca99b9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U5&y9$cAzYSr>mdKI;Vst0G|p|{Qv*} diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_13.png deleted file mode 100644 index 59b0c5a5a7f3b7bd19853ee2e3c747acacf8f116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu UamB%`i9lHfPgg&ebxsLQ0Ifn)`~Uy| diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_14.png deleted file mode 100644 index e83523427e787e6f80cde35752a4c4008b9fed43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu U$+M;ZjexQYp00i_>zopr0JY*(g#Z8m diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_15.png deleted file mode 100644 index 885926b08cbe4f24591a21f97a9c06cde30df600..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu V>BL3nmjGoMJYD@<);T3K0RXe0Rd4_R diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_5_4.png b/buildcraft_resources/mods/buildcraft/textures/items/block_5_4.png deleted file mode 100644 index 78951ea5385da7ad654cec00efc6093d51f4254e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0JX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IAVbyZ`_I diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_6_12.png deleted file mode 100644 index cd9f268f1d2f84d7123c3a6bbcb1cab8ea039123..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0IUO4>i_@% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_6_14.png deleted file mode 100644 index 8eef961ddeb3c94aded1fcff32ebcf15ac953ae3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J5l6W&i*H diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_7_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_7_11.png deleted file mode 100644 index 5808748a3a3ef3109ff0abd256ba44e1c43d4249..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J7>;TL1t6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_7_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_7_13.png deleted file mode 100644 index 51ff95e8c2204ba64e84f6f5f33f407f9961908e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0I+yfAOHXW diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_7_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_7_14.png deleted file mode 100644 index 807bd75f3e70878dd2d42369656f36aaad776c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0G!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0I=y*RsaA1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_11.png deleted file mode 100644 index 6191dbe9a18b406d3c7704c1518411015e7c4688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuzopr0J(=%&j0`b diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_13.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_13.png deleted file mode 100644 index bdfeda8cc0bb8cd0ea463c6441a813169287835e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuR diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_15.png deleted file mode 100644 index c13d8864aeb7f86166ea74e874e63e85fa556751..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H*g;hyVZp diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_8_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_8_2.png deleted file mode 100644 index 579bcc9b388088590b9ffd9467474d7bd9c9a808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu Tj!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu@~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_11.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_11.png deleted file mode 100644 index da7ce8cd31fe402fa63f923eb5195a88335d0440..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLupuk}8boFyt=akR{0H(-PcmMzZ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_12.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_12.png deleted file mode 100644 index 968a8ef3158d4fa6f79208788a794c7844458896..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0H4lO6951J diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_14.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_14.png deleted file mode 100644 index 7507d39f0ad6d68fa5262f41b658d38a099f6ebd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLumdKI;Vst0I8}}wg3PC diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_15.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_15.png deleted file mode 100644 index 820d3c7e70989a6dad484dc302ec60b7cacdef19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLuFtsN8K5kKr>mdKI;Vst0I9@OsQ>@~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_9_2.png b/buildcraft_resources/mods/buildcraft/textures/items/block_9_2.png deleted file mode 100644 index ee576343e24597fe94157b4495547beed83cf6be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SM|9l1p%g>@&KtaYNZ+91_H13)dkctA2$YKTtZeb8+WSBKa0w^fx>Eal| zaXmSKf$`#n3jwbL7$O}6blI0*+76UdEpd$~Nl7e8wMs5Z1yT$~28Kquh6cJuCLu!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L3 TP3*KJP?o{d)z4*}Q$iB}j^J6a diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_11.png deleted file mode 100644 index 1fa0bf03ba59df20585e9b91457ba7281aa8a6a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L> TQ1Ev@P?o{d)z4*}Q$iB}lk{30 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_12.png deleted file mode 100644 index 54edfc262283df332caa913807166877704b453a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~K? TA+gF7D9hmK>gTe~DWM4fgx*;Z diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_13.png deleted file mode 100644 index 1b49e048af6c439a6a253b6e40643be642b8134f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~Mg TFF$KBP?o{d)z4*}Q$iB}i+)*- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_14.png deleted file mode 100644 index 5b8c62ba7c2bfce05ed8d2695c43ae83fbe75cc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L5 Tv6>$!$-v<0>gTe~DWM4fi85I~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_15.png deleted file mode 100644 index ad541993e75f4eaf102f735b679bc8352918ccba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5N~L@ Ttj2yCP?o{d)z4*}Q$iB}kl!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5N~=S S-*r7ulEKr}&t;ucLK6Txv02^# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_6.png deleted file mode 100644 index f8b0b800d49fb6211b8b36255037f5154d1b69af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5N{Tk SCL#)yWbkzLb6Mw<&;$S}OIVZu diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_7.png deleted file mode 100644 index 40e2cc6ca78d5232ef39b2513dea54f2b7036e91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5O1!Q SsL~9SWbkzLb6Mw<&;$T1*I45K diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_8.png deleted file mode 100644 index 414f795737a29e70e9a8c1ea5c203ed1697912a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5O1;V So+Z$c3=E#GelF{r5}E)wq*;{! diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_9.png deleted file mode 100644 index 71af1846ce1033b6354ae6a87d35442d3ebf3b53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5N~<# SCMVFl3=E#GelF{r5}E)!L|NVd diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_0.png deleted file mode 100644 index 2ff2011e5c71b7edcfb8eae671a30a389c831dcd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^93 TEk4ZyD9hmK>gTe~DWM4fkJnkl diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_1.png deleted file mode 100644 index 253b8d790344ec8c00c42a272d191fc5c7c03c2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^9> TFe2<8P?o{d)z4*}Q$iB}lI>a! diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_10.png deleted file mode 100644 index 1b55820aaa066d1707e914e31c472b7160b4b2e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` UFjcT(2~e8B)78&qol`;+0Od7V)Bpeg diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_11.png deleted file mode 100644 index 214e980e97be8efab344470e1737857cefe87a88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` U_(;sd2q?|q>FVdQ&MBb@0O9vpg#Z8m diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_12.png deleted file mode 100644 index 4777d810ed71bee72ce5d540ed7e31c27cbba312..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` UR4p&r0hDI&boFyt=akR{0Nv|ZPXGV_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_13.png deleted file mode 100644 index 5d33f18be37d44703152a1a74cdf9a57a769499f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` U%p;*G2b5;;boFyt=akR{0Ma2?fB*mh diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_14.png deleted file mode 100644 index 9fabd4956dfe94c694c72a52f0d287078b208887..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` UGO1?IUZ6CCr>mdKI;Vst0Pu@iod5s; diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_15.png deleted file mode 100644 index 57d64b1ae09854901c58c17c4ac00d0482618a2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXb^8` U`n0-78z{}->FVdQ&MBb@0PC|_E&u=k diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_2.png deleted file mode 100644 index c649a22d5a5fef005e80db12c8a765b70883c392..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^8? S5y%d5F@vY8pUXO@geCxifmqf6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_3.png deleted file mode 100644 index 032d2dfe614af1081acd15d1ffaeb279facac84d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^Ag SA7%~;90pHUKbLh*2~7ZvBU!Nk diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_4.png deleted file mode 100644 index c58fe22bc20a427ae5fb4649b894ea319acfdf57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^95 T(P&X1P?o{d)z4*}Q$iB}kmXt0 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_5.png deleted file mode 100644 index 842dfe3ecfd09497dfd230dcc5b56fd054784332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^9@ T%yiOmpe%!@tDnm{r-UW|laX2( diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_6.png deleted file mode 100644 index 79bb0e42d836a4a58920c0b22810e1481fe42bde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^8^ TZ*#a7D9hmK>gTe~DWM4fjE7mF diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_7.png deleted file mode 100644 index 83d802808d43d9225350beca19efe41d648e787f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^Ai TVg30vP?o{d)z4*}Q$iB}l}}no diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_8.png deleted file mode 100644 index 73611d3ca078e290933b5e5ef42c6f81f4d0c2c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^94 Tqvc%{P?o{d)z4*}Q$iB}oTOT; diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_10_9.png deleted file mode 100644 index cced19b48ea7682ac952d6f3a83616af7c4ce4c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXb^9? TzWLr8pe%!@tDnm{r-UW|p8#6r diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_0.png deleted file mode 100644 index faee0b04e4ea0287e4c0d18f674626366dfac051..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%vB TeJ)QuP?o{d)z4*}Q$iB}k$YL- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_1.png deleted file mode 100644 index e2c7c768b32e7485fd29a1044798ec560e258a60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%v} SV3rNY{|uh4elF{r5}E*&@mfIu diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_10.png deleted file mode 100644 index 77714dff5a69c41dae25307052db9c85855c71d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc!N) TVXgc@pfrQ0tDnm{r-UW|!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 U7_~}294O7;>FVdQ&MBb@0OGn?o&W#< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_12.png deleted file mode 100644 index 72d69c43edbdcb140e306c89fe50e1ccffa836b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 Uba-*yTc9+9r>mdKI;Vst0QBNo<^TWy diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_13.png deleted file mode 100644 index 8d29f79c48e4e503aeddd79c0a067edb5b3f6e5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 Uyk&`BHBg$t)78&qol`;+0PCn)Hvj+t diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_14.png deleted file mode 100644 index e161f4aaad884640bb1f5f46d03976f80a21cd9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 UqIKZ*4WKlGr>mdKI;Vst0P!qZv;Y7A diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_15.png deleted file mode 100644 index 2ce69e17182b0a5a8dc801ea4c892a12ea173857..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc%v3 U8hiY;A5faX)78&qol`;+0PeI}bpQYW diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_2.png deleted file mode 100644 index 6a29e8ea334f19c58dd88d70f3e1c9dbf8fd04a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%u~ TIXO2ND9hmK>gTe~DWM4fiaA+t diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_3.png deleted file mode 100644 index 6bf9c5597df53900e3654e87ff33bfe37dd67862..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%wo THzoEcP?o{d)z4*}Q$iB}kds;H diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_4.png deleted file mode 100644 index 9c669796172165c9cef20b27cda86c3ca83d34bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%vD T;lqhEpe%!@tDnm{r-UW|pD$X| diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_5.png deleted file mode 100644 index e77c75ff49fae3ae6135e084edcb88720b24e6e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%w0 T{QHj&Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%v1 T_iv>aP?o{d)z4*}Q$iB}ljT|# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_7.png deleted file mode 100644 index 963a24a25295af23987e2af7a13faf99e7950462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%wq T`E%wSpe%!@tDnm{r-UW|n&n!b diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_11_8.png deleted file mode 100644 index 85e10df8eb8ded651c6b066787fc5f086de957c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%vC T)2#*QZw3ZWS3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc%v~ T&T-3ape%!@tDnm{r-UW|m;732 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_0.png deleted file mode 100644 index f65edbc534d97b82feda1e0996811264af176862..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX7 U_4X#9pBWfDUHx3vIVCg!0GXd!Y5)KL diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_1.png deleted file mode 100644 index 1386bb4f51926e0186ce6f7072b7ae100c739238..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX_ T=uXoHpe%!@tDnm{r-UW|n(!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UU@x&jA1KY>>FVdQ&MBb@0NsUIN&o-= diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_11.png deleted file mode 100644 index 0cd1ec9de55de8b6afb925c94013743cb565f292..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ U=po;*6DZB#>FVdQ&MBb@0OIjkwEzGB diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_12.png deleted file mode 100644 index 589ee984a32effa9de5466e75bdb627d2517f1b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UbW!XgD3BODUHx3vIVCg!0OmVc(EtDd diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_13.png deleted file mode 100644 index 574651077ee23c074af794d55242020e02436116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UyiD-nRG>72r>mdKI;Vst0PCAtL;wH) diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_14.png deleted file mode 100644 index fb4be23f4bd810c5fea80c5fa56ad61053d36123..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ UVo_RR29##-boFyt=akR{0N>wPZvX%Q diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_15.png deleted file mode 100644 index 24e917cbb481631fa735b15099e599f39b1604ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcTW~ U>R;rt04UAi>FVdQ&MBb@0OR#pz5oCK diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_2.png deleted file mode 100644 index f6c7a18bd922cde65d801e3d22d760e59d49ef98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTW` Tef2UZ)EGQn{an^LB{Ts5kSSTw diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_3.png deleted file mode 100644 index 81bc6e2f6c783f1ddadd13a27c7c2749b00426a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTYk TbLsIMpe%!@tDnm{r-UW|nP*yp diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_4.png deleted file mode 100644 index 28c0c1becdb10fd3882116d10e9f85db9b121566..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX9 TX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX{ Tbfeo!pe%!@tDnm{r-UW|l|5Q4 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_6.png deleted file mode 100644 index 3d073f15757e17fdb8e1d07ed716670dc4a5f540..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTW| TvqM}MD9hmK>gTe~DWM4fg!fqn diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_7.png deleted file mode 100644 index f12662170c69e8d3358e388a07fa1abec7b3fb9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTYm TygTe~DWM4fjSE?y diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_8.png deleted file mode 100644 index a4767cb5f9cb9c0b8ba5c36718384562b0935a0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX8 To54y1D9hmK>gTe~DWM4fhB#Rh diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_12_9.png deleted file mode 100644 index 346ea71159fda1128c428efa2a6260cf14765a9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcTX` ThMlVkD9hmK>gTe~DWM4fhPYWO diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_0.png deleted file mode 100644 index 6c6ee73688b64a0ad4b315e79656f1a5a6e4c3a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{F TMe>FqP?o{d)z4*}Q$iB}k4IU# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_1.png deleted file mode 100644 index 5de2706f4cc1c31d4f1b3a766a2b334f6911181b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|2 TSnfqTP?o{d)z4*}Q$iB}lW|%U diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_10.png deleted file mode 100644 index 77d8875575b821e166b37a0e16954db16ca87e94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U(7xol7f_nP)78&qol`;+0PW6NVE_OC diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_11.png deleted file mode 100644 index bd0ddac958c0a1c3ae5d97cd26fc08be99ce1095..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U_+jz$J3wg$Pgg&ebxsLQ0Q{<3YybcN diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_12.png deleted file mode 100644 index 97e91e0ca1fd9c6ff37408319f4436e4a7dd412b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 Ul(}kK8c>?S)78&qol`;+0PF}_MgRZ+ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_13.png deleted file mode 100644 index 595e55dfb4fd05f57952ddc2b2ce1d67a4f1cb1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 UEVs7p15ld5)78&qol`;+0PFZ#SpWb4 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_14.png deleted file mode 100644 index 31e669f4ecf56cfde1770f8104d2fa4ed91fbad8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U(r{8Z7%0u)>FVdQ&MBb@0Og8V$N&HU diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_15.png deleted file mode 100644 index e9a390038ff818cacf3b63bb3ea318d2725f6315..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXdG{7 U`u&{pQJ^$~r>mdKI;Vst0Q3M_#{d8T diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_2.png deleted file mode 100644 index 0151ec08b09a7bd0f7f8689a4f7c4efb229eba6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{3 TCBD-ZD9hmK>gTe~DWM4fhBa9% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_3.png deleted file mode 100644 index 07df039805555f5868cf7530b77181ec921eb15a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|s TE6}+bD9hmK>gTe~DWM4fiUV19 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_4.png deleted file mode 100644 index d0c51f375c6dcda9ecae9a4ec766b94e6e5b13b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{H TxkQEoD9hmK>gTe~DWM4fiW6B< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_5.png deleted file mode 100644 index fbd4b0f9d3b12b1bad271c63158843dc312798e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|4 Tq*!MjP?o{d)z4*}Q$iB}kE2=1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_6.png deleted file mode 100644 index eed6024fcb7087385cc35a2376ccecb8b58c8af5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{5 TTUDz9lx6UA^>bP0l+XkKhv`{C diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_7.png deleted file mode 100644 index 558083fbc6d9edbf46260efc5eb23018e9f3e1aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|u TRqMM6D9hmK>gTe~DWM4fjg48b diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_8.png deleted file mode 100644 index 93a468d3f638340ef01d1cb4e95ae8e26128043b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG{G T>rj9)P?o{d)z4*}Q$iB}laN{Z diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_13_9.png deleted file mode 100644 index f75206504e92d6b2020bff229cdfff6b21db9caf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXdG|3 T_GrRZpe%!@tDnm{r-UW|nMhi5 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_0.png deleted file mode 100644 index f07c01883e0223d2bfdd6c1b0cd4e48bd61893c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL5 TG3?wFpe%!@tDnm{r-UW|nAlov diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_1.png deleted file mode 100644 index 039b19658a80b2381173b2180ec1e4b3096d3c85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL@ TEbt!_P?o{d)z4*}Q$iB}ktA8% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_10.png deleted file mode 100644 index 48c543bd24bb159ac646a4502631511f0651fb7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| UAXWVSGf!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| Tm|Jomrz@g diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_12.png deleted file mode 100644 index be1cf7d0c3f5d9401b1be99ee4a54ae369d8aab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| U^rg1%K2Vy$)78&qol`;+0QMeQ_5c6? diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_13.png deleted file mode 100644 index e48d30c3b2509bf80f7bec1c6fa2afe7a4d24540..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| U++4NK6DZB#>FVdQ&MBb@0O|Bv9RL6T diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_14.png deleted file mode 100644 index dae4eeac1f1b8013453d989b77ad556b76a1a0fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| UA}go;3MkFs>FVdQ&MBb@0N!L-Y5)KL diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_15.png deleted file mode 100644 index f877f14a0912bb5646ab40e2b6523f249bd6f0c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXcBK| Tnk6X>GLOO2)z4*}Q$iB}+=N** diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_2.png deleted file mode 100644 index 80bad2b7031d4036e6528d6d1ae99df233484a5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBK^ TAF+N1P?o{d)z4*}Q$iB}kQ!O! diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_3.png deleted file mode 100644 index 708b7d3dd4d4513c380fdf9ff9854d14f98a8efa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBMi T5kFrKD9hmK>gTe~DWM4fi9%Uh diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_4.png deleted file mode 100644 index d120dc89d440a9dacb23e00236961ef6c71d0c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL7 T&6=whD9hmK>gTe~DWM4fjKo=x diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_5.png deleted file mode 100644 index fb0ba6d14c33fd98210726a5ff5497477c0ac35e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL_ T(8fv{D9hmK>gTe~DWM4fhH6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBK` TVVb=VD9hmK>gTe~DWM4fi2hk) diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_7.png deleted file mode 100644 index 6ad76d39b1033bf0e835d383eee2cd7188a9f6ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBMk TZxn3~lx6UA^>bP0l+XkKgb-N% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_8.png deleted file mode 100644 index 53e2b880e1a5c6f34876e0a1393be39dc520d1a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL6 Tzt?RUP?o{d)z4*}Q$iB}mh)Of diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_14_9.png deleted file mode 100644 index 0bc9311b3976d97dd11182467dea90560dd0d1d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXcBL^ TqN@z(M+OE@S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*D TVak%lKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+0 TeDV}ipe%!@tDnm{r-UW|k?>jR diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_10.png deleted file mode 100644 index 46c041cb619081d1c545a79963a3056337532577..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 Uu;_fpG@vwtr>mdKI;Vst0P(e2rT_o{ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_11.png deleted file mode 100644 index 4aa32c8f01ce9e04627b5974aab20a22fc14829d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 Uc=f~%pezG}r>mdKI;Vst0Pl}lZ2$lO diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_12.png deleted file mode 100644 index 0616e00c45aa5a28a3eecb1e7adec33db6e24235..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UmdKI;Vst0P@FL$p8QV diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_13.png deleted file mode 100644 index 7b36a84f7a969a5700ec38db54b693e468cd3940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UY<=ve4p5rG)78&qol`;+0O|c&AOHXW diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_14.png deleted file mode 100644 index 15b8c166922dcbe4301b0ee0bcfa4f0ce1acf69b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UvUHJ8KTw*%)78&qol`;+0PEvgJpcdz diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_15.png deleted file mode 100644 index 95540a7bfa8f68c5c62261d09050b355167aef25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK7-U0QW=?8eVs5Hc36Q~HXc}*5 UdTD8mBv6{c)78&qol`;+0PB-lC;$Ke diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_2.png deleted file mode 100644 index f70630969a1e206e38a800677219a2cbf626d324..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*1 TH|uCWP?o{d)z4*}Q$iB}lNwqR diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_3.png deleted file mode 100644 index 80bbc0931917e44fbb98588d8bf941c733b99376..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+q TIrpn1P?o{d)z4*}Q$iB}kg8eS diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_4.png deleted file mode 100644 index 6f4da6667e7a7d0215f98ddd0c6af3eaeddc77dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*F T{b#~1pe%!@tDnm{r-UW|p9Wgf diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_5.png deleted file mode 100644 index 198c95b27bb9c912ab7c8e1589838ecac34f7b56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+2 T;9r0aP?o{d)z4*}Q$iB}liXSa diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_6.png deleted file mode 100644 index c1f28edaef56b881778a3ea5c4d3d7aa507dc40d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*3 T`JHhZP?o{d)z4*}Q$iB}jwD&K diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_7.png deleted file mode 100644 index d717e4b7bf9d5d4125d01e787c8a5bcbf29a4f03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+s T_rVY-$-v<0>gTe~DWM4fiXK^8 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_8.png deleted file mode 100644 index 29a77c482912c728484da2d1af57d0764ce45b83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}*E T&tGREP?o{d)z4*}Q$iB}kk?t) diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_15_9.png deleted file mode 100644 index 4ff69142940d5601f5ef53c3caf2f9fe86fbdfa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~HXc}+1 T(nE$FD9hmK>gTe~DWM4fg-uxk diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_0.png deleted file mode 100644 index 46b38885627b1a69a3af182a9f89cebbaff519f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mui S_-%2ZB!j1`pUXO@geCw$BU&K< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_1.png deleted file mode 100644 index 46ca4159dc807cc241c32eace375ffabf6ae5f2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;kv) S!0Se!B!j1`pUXO@geCw-U0SLD diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_10.png deleted file mode 100644 index 85930f8be911ce0b74273e23a2ec9a17ca7feb67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k8h Sw`vW@I0jEwKbLh*2~7Z$by^_+ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_11.png deleted file mode 100644 index 7e6c4bc62cf16c71f647537ff6c1019c00f6930c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k7O TxpvMgpe%!@tDnm{r-UW|lo?ts diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_12.png deleted file mode 100644 index 15701530a90717d776cd7d44e95c29c9a041c839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k9Q Tu;gq2P?o{d)z4*}Q$iB}l!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k9& TeevI8Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k8j Sc{~H;d!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7;k7Q TcOc?3P?o{d)z4*}Q$iB}l80Ik diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_2.png deleted file mode 100644 index 033468b752856fb230848189c38de1cdfb7177c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;hAQ Sa+ftwlEKr}&t;ucLK6TwNm<4K diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_3.png deleted file mode 100644 index 595bb2e23fa9c8560e2f0a703eac318fadb21398..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mg_ Su4^q&lEKr}&t;ucLK6TwUs=}x diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_4.png deleted file mode 100644 index 7da220c371dd7539b930eb2c2659f4630a9c30b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;my~ Sl{_C%lEKr}&t;ucLK6TqM_EV! diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_5.png deleted file mode 100644 index f3f0aa771e994a30cba6b1a4ede00b684f60cce3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;k!V Stv=9e3=E#GelF{r5}E)#7g_ND diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_6.png deleted file mode 100644 index 456895a586bbf645dceaf9d827b6e682488f83c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;hG^ Sq)rJa$>8bg=d#Wzp$PypWm!o8 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_7.png deleted file mode 100644 index 7c6a2e6cd1d60c5f704640316c18b9ea8cab817f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mn= S*l!C^lEKr}&t;ucLK6Trp;>|e diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_8.png deleted file mode 100644 index fc1367f95eca64e58eb4bb635b1b1b38fe211133..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;mv% SCRi0H$>8bg=d#Wzp$Pyl%vk~e diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_1_9.png deleted file mode 100644 index 9e8c67a234422434d259b8985937ea92bcca69bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7;kw% SI(aitlEKr}&t;ucLK6TubXlnY diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_0.png deleted file mode 100644 index c816db3638e7402a5ea0a66289e71ea00bf4aa6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPJ* SG1U(!$>8bg=d#Wzp$PyulUbht diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_1.png deleted file mode 100644 index 54aa8f25144cf01ac8c1c04693aa54bc31c168b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mNK@ SE%XLZlEKr}&t;ucLK6T$AzCm1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_10.png deleted file mode 100644 index 675c6397bc76a701ccf43e026b3ccfc4cbc6db12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMuy TBhNeuD9hmK>gTe~DWM4fg(O)L diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_11.png deleted file mode 100644 index be88f6276b01c35d915f7f65deb052e6be022437..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMwA TEn&<8lx6UA^>bP0l+XkKc_vsr diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_12.png deleted file mode 100644 index 85e752287c628be7974be95ba4ee8a48ca1cf6e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMuW TNib<2P?o{d)z4*}Q$iB}jY3(c diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_13.png deleted file mode 100644 index e91b4d9d9714e1bf4d619aeaf0f6a842f0bac674..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMw! TR4hmXD9hmK>gTe~DWM4ficncv diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_14.png deleted file mode 100644 index 31f3da852296a2516c1ac07219a909fdf4970a7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMu! TU39z~D9hmK>gTe~DWM4fl#*H{ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_15.png deleted file mode 100644 index 2ee4f3f5c2dac82416a11625b6f4bc5d19f3e44a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H6mMwC TQ~F&ND9hmK>gTe~DWM4fit1T> diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_2.png deleted file mode 100644 index bf36281d9b8735ab8882fd836a25f895260dbf91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mJyT S&yoa`WbkzLb6Mw<&;$T3-B|np diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_3.png deleted file mode 100644 index fffa9bdad2e0b3484901a2c1ab4605996304cc45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mP85 SVe$ni$>8bg=d#Wzp$PyrUs;6! diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_4.png deleted file mode 100644 index 4fe9861ffbb39cfb4d912359a73139ea02c74c85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPQU S&BAb?B!j1`pUXO@geCw&=~`3( diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_5.png deleted file mode 100644 index e351d246e7e056cf3c5dcf6222eeb1f6f156d588..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mNR^ S^~8ffNd`|>KbLh*2~7Y!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mJ&v S=s-14lEKr}&t;ucLK6T#TUsRm diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_7.png deleted file mode 100644 index be1799daf140995c9beb53954ab6ca1db5101614..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPEj S^ut@AB!j1`pUXO@geCw*Gg_Vi diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_8.png deleted file mode 100644 index 53958186cbeb2b16ea0b85b3674d4444e3116eb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mPLL R>Mh7L22WQ%mvv4FO#nbRS}*_r diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_2_9.png deleted file mode 100644 index 57138f70992f5993b4e71cd72be5eca88b41458c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H6mNMb S_U!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;78 SnZFV!$>8bg=d#Wzp$PyoZ&@|~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_1.png deleted file mode 100644 index 6c11a3b4134edab3e0a517df71b8d4cca56a2e2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B+8m S#r{1|lEKr}&t;ucLK6TyU0Lw} diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_10.png deleted file mode 100644 index c119e726f93cf9a81f9fd13f9b6aa5e31f6c5c55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*iF TWO2%Ope%!@tDnm{r-UW|o8wxg diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_11.png deleted file mode 100644 index 5263db9e47d532f7a0d2f34934a932ba97ff3b4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*j2 Tc}YkjP?o{d)z4*}Q$iB}l66_| diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_12.png deleted file mode 100644 index e72b3bb1b63ecda06a13ab280d641d6cf2d68efb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*i( TwU+fZP?o{d)z4*}Q$iB}j9por diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_13.png deleted file mode 100644 index 34e812addf31a3d622193f31c523e61a86aa7125..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*hG TyUG;kZw3ZWS3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*iH T_}qebKv@P)S3j3^P6JCT diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_15.png deleted file mode 100644 index e71cb01f0e7d66c3d1c60f2a91fad32b434b66e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9B*j4 T<>Z74pe%!@tDnm{r-UW|nP*yU diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_2.png deleted file mode 100644 index bef440ed8d4d4d56d182df7c41f47c29694ac623..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B&lj Sn->a{WbkzLb6Mw<&;$T5C0Q2$ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_3.png deleted file mode 100644 index 8ad2e7ab7033ef89c433f3aafa964c4bc85758c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B-`b S6?YgY$>8bg=d#Wzp$PynuUSF> diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_4.png deleted file mode 100644 index 1d7d9edb815967a4b00a8f6d501d6fee24e4e1f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;B$ S?{orClEKr}&t;ucLK6Twt69qc diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_5.png deleted file mode 100644 index 42bb9ccad7862eef759bf795dbb35b7735d8952a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B+C` S^Y=HPB!j1`pUXO@geCw*e_EOV diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_6.png deleted file mode 100644 index 88dfa3777de1005d1f1ec1cd00b106b94e2d392b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B&q^ Su*wH0$>8bg=d#Wzp$PymiCG{3 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_7.png deleted file mode 100644 index ab457eca67c51bd1860e041c8c609b698453170c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;0o SKI;}xlEKr}&t;ucLK6TqX<2sw diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_8.png deleted file mode 100644 index d3af64376e77cd35d3b3021339b04c6237b40a5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;8@ SM!PpqlEKr}&t;ucLK6Tx%vsj} diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_3_9.png deleted file mode 100644 index 831633740149dba62d7b984f35cc77de81c11745..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B+Ae S{`R{-Nd`|>KbLh*2~7Y;Kw7W> diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_0.png deleted file mode 100644 index cf450f166ae3e1a700008d3fbd04a42c2181c06b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^u1d RM-t>V22WQ%mvv4FO#n8`S&{$% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_1.png deleted file mode 100644 index 572fcb607968940bbeeee0e663a594f0cd8a035b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^s2d STQdtN$>8bg=d#Wzp$Pym)L9t- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_10.png deleted file mode 100644 index 28d9927daf6cb65bc28ecbfe7f681f468873d1db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rb_ TSrX$1lx6UA^>bP0l+XkKiGf*L diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_11.png deleted file mode 100644 index 71fd52f2ad88c7d78bce94fa0c0e07c0574ac602..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rdz TSDbSLD9hmK>gTe~DWM4fj!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rd< Ty~;KTD9hmK>gTe~DWM4fk1tua diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_13.png deleted file mode 100644 index 914b3f41c8e9b8583eaa3afdd0768fe29508690a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rdH TpqBRwP?o{d)z4*}Q$iB}l*d{n diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_14.png deleted file mode 100644 index 0095a4a15e5e67090eb59fd429d8328a86fe72cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rb{ TCpjY=D9hmK>gTe~DWM4fh<#a3 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_15.png deleted file mode 100644 index 9c0d48d7e2878af95bb959489228ba191885d234..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5^rd# TDYxPvP?o{d)z4*}Q$iB}i_2M= diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_2.png deleted file mode 100644 index ba64a9dec48cfcf152ce8f8106d1088d68c1b4c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^og9 SRB-_)$>8bg=d#Wzp$PyoZdp$N diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_3.png deleted file mode 100644 index 3e90dc82b7815e33f2c471ecea54dca31a2b5117..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^t== S>fr{IWbkzLb6Mw<&;$S`T3BuX diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_4.png deleted file mode 100644 index c8d25a1c3425a83c3bec4fb536352da06226f673..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^u62 S@$OTgB!j1`pUXO@geCw*C|Z#K diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_5.png deleted file mode 100644 index 61dd3756121d24bb896c4e4560ef82e7e02304a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^s7w S?Jdxu3=E#GelF{r5}E))3R+A6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_6.png deleted file mode 100644 index fe4dc9be419ec8acd47ec616f06925c25a06b626..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^olk Szvm=SlEKr}&t;ucLK6Ty!de0V diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_7.png deleted file mode 100644 index fe62f5a7f650abec9342f59eace9ba049251df4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^t`U S(Gw4pWbkzLb6Mw<&;$T67+Ea< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_8.png deleted file mode 100644 index 27b390adb1f6e2fcc5e1c914d31ae7518a38087e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^u5b S`owcUNd`|>KbLh*2~7Y-lUktw diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_4_9.png deleted file mode 100644 index 38a483d1c59750cc0f1340a1551e30df7777dbed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5^s6z S!omokB!j1`pUXO@geCw&ZCXkI diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_0.png deleted file mode 100644 index 545d91a39bf87c32abadc573de8c2907ed7cfe67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH=g ST=8k3B!j1`pUXO@geCw)oLYSV diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_1.png deleted file mode 100644 index e155949e3af122349c964ecbc234e0ce28b19715..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gF>= Sq;o7#lEKr}&t;ucLK6Ty+*#%T diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_10.png deleted file mode 100644 index d94a6c659eb3b1ab3bc130484ca00fc0b11498bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFRu T@PxHCP?o{d)z4*}Q$iB}lWbY^ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_11.png deleted file mode 100644 index 62633ec3d9097db4d0402fe6c7b09ada8c7a6b4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFPg T?L7Bhpe%!@tDnm{r-UW|lmJ>2 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_12.png deleted file mode 100644 index 3354b71ed649bde5b11ad644d3df90bf236007d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFRC Te=Ld}D9hmK>gTe~DWM4fhAvqh diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_13.png deleted file mode 100644 index 148ac4c4172a96a9709699de9d5c606dacc7c0b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFP^ TaWHElP?o{d)z4*}Q$iB}lxA8S diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_14.png deleted file mode 100644 index 7e031dce01c763dedc4d264cace22ad8488228ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFRw TZ0Ua^pe%!@tDnm{r-UW|od#N^ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_15.png deleted file mode 100644 index f80121a622634b93c34c61fd4ba1b3c42a0f2b9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8gFPi TanboDKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gCSE SK!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gHzA ST&WN!$>8bg=d#Wzp$Pyn_E|Ro diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_4.png deleted file mode 100644 index 22ad35c242063b9a8b62a3b8679a91ad8317db6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH_5 S@%BqVNd`|>KbLh*2~7Y-9$K6L diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_5.png deleted file mode 100644 index 5fa56692b0b09479f2f24c533b71d69aa31f87ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gF`T SNxKVBlEKr}&t;ucLK6TzxLNf8 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_6.png deleted file mode 100644 index c7eb8e567b58d9b66b01c002e39c5adbef45038b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gCZ9 S_S!$7B!j1`pUXO@geCw)q*{>x diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_7.png deleted file mode 100644 index 59ca05ab3c4675915161b5615dda5bce96592edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH(! S>RAR*lEKr}&t;ucLK6TwT3ONn diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_8.png deleted file mode 100644 index 1bac12680fdd1e16206661a3c58d2babdc7e11fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gH>d S^!HDoB!j1`pUXO@geCw(Gg@>2 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_5_9.png deleted file mode 100644 index 400533f41ae9e19e926b160a7e896e080818b29d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8gF@A S=yX0%lEKr}&t;ucLK6Tw!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_bp S!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H@dE S|1S$rlEKr}&t;ucLK6T#P+AZG diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_10.png deleted file mode 100644 index afce77997d4c4167eada0535b72ef9314b3f651e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??q TxpvA?pe%!@tDnm{r-UW|oa!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??S TQne%)D9hmK>gTe~DWM4fko8&I diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_12.png deleted file mode 100644 index d99f633934461a936d5529308bd868da6800f4ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H?=I STl^K|e+ExiKbLh*2~7Z&Ia*c# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_13.png deleted file mode 100644 index c25ec680786281170ca88b7d6cc1e082f057823b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H?>r TRdTc*D9hmK>gTe~DWM4flP6jW diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_14.png deleted file mode 100644 index 3f6dfa1dc489776c4ceaa64938a85018c32e324d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??s TMIhh~P?o{d)z4*}Q$iB}luue3 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_15.png deleted file mode 100644 index 5626992944f2c2195224f659e14e14a1a33200ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H7H??U TES}&6lx6UA^>bP0l+XkKhc8(# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_2.png deleted file mode 100644 index fd484c095d2267bc1d0a280e62bd5fda78a0f1c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H<^P Swq_qtlEKr}&t;ucLK6TyPFeT> diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_3.png deleted file mode 100644 index 994ee5a48d65f053127c285f94f01bca4171f1b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_QD SI7b60$>8bg=d#Wzp$Pym##tc% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_4.png deleted file mode 100644 index 875c85ac4bd93bdc86601f3dda40e9808b6b1a00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_iq SDQ7oOlEKr}&t;ucLK6Tz5LxU1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_5.png deleted file mode 100644 index aaec7c9cd77e7d52e1738979592b1c9cbfb2794f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H@jy Sk)!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H<~% SI%7FdlEKr}&t;ucLK6Tz%328k diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_7.png deleted file mode 100644 index 03f4b9f466f60bdd7e74b501d33a429abd7873ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_Wf SCc+RX$>8bg=d#Wzp$Pyp+*wip diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_8.png deleted file mode 100644 index 31ebda296b6a18ec265c1966782d775d0832763a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H_dB S*mVI=lEKr}&t;ucLK6Tuk6ESw diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_6_9.png deleted file mode 100644 index ed8483979a9f1ca777519581de529b88240986e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H7H@ep Sq|^*3$>8bg=d#Wzp$Pyt9a(_@ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_0.png deleted file mode 100644 index 7860ebdae7ad0563bdd06d9c76bb5b21833d8e12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fPM SYxz>3B!j1`pUXO@geCwz;93X( diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_1.png deleted file mode 100644 index b9f242b72b1d1f301c57b1c46bcb36fe9a4f275a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&dQc Sce*i9lEKr}&t;ucLK6TuL|K;r diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_10.png deleted file mode 100644 index 8b6d38c3c5462d91c6524d3fd231361d4cb38c09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c#i Teem-Fpe%!@tDnm{r-UW|nao;- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_11.png deleted file mode 100644 index 5af87ed98ccf12544cb2bb9dbac7230adf7bcc00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c!9 TbL_AgP?o{d)z4*}Q$iB}kv3W5 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_12.png deleted file mode 100644 index 963f7c35385cd4778b6dc4e45c54047b921d871d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c#0 T^!%hApe%!@tDnm{r-UW|nhsif diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_13.png deleted file mode 100644 index 6def3a949da4549a6116c7bf462eb457aabc0414..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c!T T>BJ%_pe%!@tDnm{r-UW|mz-Ka diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_14.png deleted file mode 100644 index 2a29fd8ae193bb5e5c6c7d067073be6f6705920f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c#k Tv&MWUP?o{d)z4*}Q$iB}kK$R= diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_15.png deleted file mode 100644 index b619249b52f75926fcde29df62f8d6dffbd61139..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H9&c!B Ty_#JgD9hmK>gTe~DWM4fg)&(P diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_2.png deleted file mode 100644 index 85068a3f35c306a2533d892e426508733b7e62fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&Z%v Sa;y_5$>8bg=d#Wzp$PytPFbA* diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_3.png deleted file mode 100644 index 14af81433979c7663b77832a16a56834559fe8ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fDT S{7oJx$>8bg=d#Wzp$Pyno>?>i diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_4.png deleted file mode 100644 index 6d89bf95a9ae942b8c27dc5dfa4492a1fb47f274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fTs SJ$VmMlEKr}&t;ucLK6TvT3NXO diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_5.png deleted file mode 100644 index 623b00dc41be460f274e3ba7a56c313c7582f17d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&dV9 SAy^A2$>8bg=d#Wzp$Pyn=vgEH diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_6.png deleted file mode 100644 index 972c660261de1e86ba7136cce090dacdc580bfde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&Z++ S$ut2d$>8bg=d#Wzp$Pyhuvp3f diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_7.png deleted file mode 100644 index 79122b6151dacd6d6f8ff35c390edd29b4c35c68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fI! SXT%1SWbkzLb6Mw<&;$S^npi~u diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_8.png deleted file mode 100644 index bf3ff3ee72c332d39f0ef96fdec647722f481175..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&fRE SqW*NCB!j1`pUXO@geCwwt69eY diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_7_9.png deleted file mode 100644 index f44fcafd6c4f265a127c3e9079f0efbf7f510e8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9&dSM Snmi*=lEKr}&t;ucLK6TpnOQgh diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_0.png deleted file mode 100644 index 5f90a7a049ab6282d2062ec4391a3152bfde237f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS?f S>;ceg3=E#GelF{r5}E)!>{!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pQ@< S@B$xDlEKr}&t;ucLK6TrfLUh% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_10.png deleted file mode 100644 index 23643af72e8a284101790c8a93def1a4b474379c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQT9 Tyy)>ape%!@tDnm{r-UW|m!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQUi Tvh;ESP?o{d)z4*}Q$iB}l-*h- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_12.png deleted file mode 100644 index 107530fcc552e5de39d7ec80ab9e23d59da59573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQVp TcTLkRpe%!@tDnm{r-UW|psQN% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_13.png deleted file mode 100644 index 6ba2382810519dfc89fa41c5bf1ac6106ff6d73d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQVR TwR)2eP?o{d)z4*}Q$iB}l;>I= diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_14.png deleted file mode 100644 index 85c1623d936fe7b326541d48371f71b4c39a9d60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQTB Ta$fyCP?o{d)z4*}Q$iB}kYQQn diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_15.png deleted file mode 100644 index 730c3827208563914dc1ed5ace754b353f00cf23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H5pQUk Td_ueuD9hmK>gTe~DWM4fjvHC1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_2.png deleted file mode 100644 index 20371c597bae33076c07d2e0a38df01a3d7ed0e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pNVB S(YOUD$>8bg=d#Wzp$PyphFM(z diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_3.png deleted file mode 100644 index 63ecc08a48f2effcf4544256c0c482f6f51e627a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS$7 SzflP&$>8bg=d#Wzp$PyirdZkl diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_4.png deleted file mode 100644 index 2afa59da0e8e393e7616c4c812f40a440366a60a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS}w STBQ*v$>8bg=d#Wzp$PytSXqkz diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_5.png deleted file mode 100644 index 88d84a724768d4cb2021fba62367cf3d08234fba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pQ~| SMnoJa$>8bg=d#Wzp$PyohFK^8 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_6.png deleted file mode 100644 index 1350f2d37580f03d5742ad8fbaae48b046a51f4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pNb> S>be#v$>8bg=d#Wzp$Pys3R!{x diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_7.png deleted file mode 100644 index 8034e72ece36ead7deb520da093b1aa77b8ec981..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS+h SRB8>BWbkzLb6Mw<&;$T4R9OcA diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_8.png deleted file mode 100644 index ea56200185068cd06caa7e67b49106fe715a42a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pS{M SY{n{}B!j1`pUXO@geCw&r&?72 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_8_9.png deleted file mode 100644 index c6b393a88cc73779bfc328715ccd03daafd960d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H5pQ|^ RR0PON44$rjF6*2UngBh8S?mA+ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_0.png deleted file mode 100644 index 242011371df1a77e1831c7ea06527c9dffcd8c9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>%t SO4oXzB!j1`pUXO@geCw)s9Jjf diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_1.png deleted file mode 100644 index ea6f6a53e17d6ef9c84e34db18a4a35a453d78ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E<&t S@-9oDB!j1`pUXO@geCw%+*&>W diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_10.png deleted file mode 100644 index 45a46e61f05a44c31898acffd3f574852db0bd99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EP?o{d)z4*}Q$iB}kE~hA diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_11.png deleted file mode 100644 index 2b4eec4f69b3c86ea753035b90b63b83348fb54f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8E^t{an^LB{Ts5jqF*N diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_12.png deleted file mode 100644 index fa0507135767dc8331506dfda86a76161e33bf13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8E!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EgTe~DWM4fhVof6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_14.png deleted file mode 100644 index ab1e621f3bd9446fd63d89966aaf690c1708fb58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EgTe~DWM4fkj`1w diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_15.png deleted file mode 100644 index 4e88e88be1b61a8f6efa7a39b9bfb804ac693ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK2xLQAW=?8eVs5Hc36Q~H8EgTe~DWM4fkmy;- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_2.png deleted file mode 100644 index 6fa9b902f6e69a711833bdb49833522875e8575b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E+JM S>vc0wlEKr}&t;ucLK6T&R$5vB diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_3.png deleted file mode 100644 index b8867632a60e2eddf129e6828cb8b58af9de8ff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>q2 S_qHfdlEKr}&t;ucLK6TvZdtVe diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_4.png deleted file mode 100644 index 79153d2bc96c2a3bc9649d338ec2cfd4308ed0c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>*- Sr{6Z9B!j1`pUXO@geCw#`dTOe diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_5.png deleted file mode 100644 index faa91a3f74662c0fb5105a2de44e2e24eeabab0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E<-g SU!4L_lEKr}&t;ucLK6Ty$XVY2 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_6.png deleted file mode 100644 index 9cc75b5270e952d6659b981759588d64d588d2b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E+Q1 SU4Ir(lEKr}&t;ucLK6Ttz*(CB diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_7.png deleted file mode 100644 index c84d24ca0fbf34dd331c9f3687bfcd1dd940a3b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>w+ SL7oRF$>8bg=d#Wzp$Pyi0$9QT diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_8.png deleted file mode 100644 index 8b51b590c2165a405780abcd9d49b185a931d02b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E>(Z SpJ^^olEKr}&t;ucLK6TnYgr}$ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guiicons_9_9.png deleted file mode 100644 index c44c3f7d82a2f6fa78fac33d5a90e2f9c7be0303..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMe;}wjwm%gp$e85q?!uJDU6TS*QQ#3-%)r1c1j3A$?$-SQ3JQ9hkfv%BBh>@X{ zfvJ^&iLQZ(m4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H8E<)x S!-yLw$>8bg=d#Wzp$PyjnOM^R diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_10.png deleted file mode 100644 index a1b001b7221d57ad3a355f0068be836370a13b8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^C THL=r@Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^i TLc!ntKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;@n Tg~TdTpe%!@tDnm{r-UW|m~mBz diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_13.png deleted file mode 100644 index cba8b32cb9f3942e2a93d02a62f3d786782494b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;@{ Tzx=GlKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^K T#cF<_Bm;w|tDnm{r-UW|oW)hP diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_15.png deleted file mode 100644 index d33823f08acdcfd501a1d933f5cdfe0afb411d1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)LA;^q TvKsqoKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUC TwfHm-pe%!@tDnm{r-UW|qiR+< diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_1.png deleted file mode 100644 index 5109c46ab85ec971e233fa3040b5782e5171e4aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUi T!icbYKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U!BoMDB|vEgPgg&ebxsLQ0QEmsO8@`> diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_11.png deleted file mode 100644 index f121a1fdb089c27046a20b1cd5b99ac37a303e79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U;Uh5*BcL>cr>mdKI;Vst0P+D<`~Uy| diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_12.png deleted file mode 100644 index dd2ece555d29443c9aef2f19462ddfecd131c1fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% UQMJ5e2T+>9)78&qol`;+0PXcv#sB~S diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_13.png deleted file mode 100644 index 2bd4d071f151fd736001438b03affab170a9806f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% UF^`0%98j9U)78&qol`;+0OBiD_W%F@ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_14.png deleted file mode 100644 index 8b364f9ed6c25c89eef36d45d8d5a78285d7a59d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U$)uV+dx6pnp00i_>zopr005*{6aWAK diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_15.png deleted file mode 100644 index 59260eb59089dc38ac72d1ebfda14081a3da5d16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p+UT% U>C@^SZJ;!Rr>mdKI;Vst0Q!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UTn SMIbxK#SEUVelF{r5}E*&6je!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UT{ Tf0#Kaa2PyY{an^LB{Ts5pte>h diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_4.png deleted file mode 100644 index 79868ab1d3ddbf014cfd29a4214e2fa21f1f4493..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUK TMWaQ5Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUq TGSf-NfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UTv Tz0KiTpe%!@tDnm{r-UW|pc+;f diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_10_7.png deleted file mode 100644 index bcdf4e792b3f79438ddb9e91231ad2d0cc657dbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UU4 ThxO;zKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUG Tjh1&+Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p+UUm T`sRCYfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qi T^|?ItKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q? Tf>|~o|1)^H`njxgN@xNAsf1Rz diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_10.png deleted file mode 100644 index c8d9779077611cc6af1c45006665b858e58d0900..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC UVbm)9aG*4Ur>mdKI;Vst0P@6E6#xJL diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_12.png deleted file mode 100644 index 4139a16c85620a201b2879ba24c04823c8222c19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC U(c#5)Z-LSbp00i_>zopr00jG2T>t<8 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_13.png deleted file mode 100644 index c4cb70004e7496a7bcb4c3c39c963e019437d942..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC U@s=fi)j(+mPgg&ebxsLQ0Q<65t^fc4 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_14.png deleted file mode 100644 index 497da767f2e118b450ae252e07ae7e6ae897b178..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC UiPnMJH-OR%p00i_>zopr00Bi;D*ylh diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_15.png deleted file mode 100644 index 54c0f26b0491ef608bb6caf748787a6b52b6bced..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p<%qC UY3%XWen4pkPgg&ebxsLQ0RFyK>;M1& diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_2.png deleted file mode 100644 index 094a6e746cdbf4406fb5bfdc2cb97d4e2c5002e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%p{ T<>cI8pe%!@tDnm{r-UW|oy=9{ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_3.png deleted file mode 100644 index ba2bff923fffdba15a1cc372a0aa2135d33082e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qS T-;~&+Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qq Tg%2mvfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q~ U^6x)B0A(3GUHx3vIVCg!0J=_B;{X5v diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_11_6.png deleted file mode 100644 index 4ad1af83d01e80869cee2de71774c57fa9601706..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q4 T-M^JyKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qa T=g*mUfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%qm UO}7@HzZn=jUHx3vIVCg!0HmW!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p<%q` TI>#-yfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fS U)!UnZer90sboFyt=akR{0If1s;Q#;t diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_1.png deleted file mode 100644 index 3c28e4d2073c4461a3d359bb89fd3a2de4169847..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fy TqB~6+fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ UfxW~AeV{ahr>mdKI;Vst0PT-e!2kdN diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_11.png deleted file mode 100644 index 4d787d65cd3fcb2ee8ce8f4c3cfdfb7ebbd58525..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ Up@)3KPM|b{r>mdKI;Vst0P_1*EC2ui diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_12.png deleted file mode 100644 index 6b6e9a16bc5e931249776e73d9051ec9db9421e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ U(M7R~pg>~qboFyt=akR{0QN;zNB{r; diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_13.png deleted file mode 100644 index 8318f18cfc18573ad58edf410135185e90a22f9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ U@iM`OQ-RV9p00i_>zopr0Q;p@y8r+H diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_14.png deleted file mode 100644 index 56bc8491c879008d86bfc0d3b3b79b8eba17642a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ UiA8CN8Bm(R)78&qol`;+0PpEl<^TWy diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_15.png deleted file mode 100644 index 86f9d694c87292c86ac9b9d2a027cdad39a96e11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p;5e{ Useh5n0-!X5r>mdKI;Vst0Q3J=H2?qr diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_2.png deleted file mode 100644 index a4b63195c55636364f7828ec726ce186aa60b020..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5e% T_0`LuP-F0P^>bP0l+XkKqr6r~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_3.png deleted file mode 100644 index ed859e07724de40c0fd7885d5c2b18636ee517a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fC T&!xw6fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fa TrEO*QKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5f) T(v5B_fwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5e< U%?@#(D;XF(UHx3vIVCg!0GNtZeE!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fK T_kQ(Ope%!@tDnm{r-UW|pq^G1 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_8.png deleted file mode 100644 index 2af569227bb847a4ad1a69f76921b2e3ea66bdfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5fW TZ3Zh5pe%!@tDnm{r-UW|nafp* diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_12_9.png deleted file mode 100644 index 7db79b4514ab58d625a578d40bd6f5d02be70021..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p;5f$ T8g{NGpe%!@tDnm{r-UW|noCuo diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_0.png deleted file mode 100644 index 408989e081cf3dd7a9618912057ec34ab718b1ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#y T70DZdKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e$7 TV!0RXKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S ULHm;HUO;IEPgg&ebxsLQ0R7lj*Z=?k diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_11.png deleted file mode 100644 index 674f6a338d04e8d818e67b47a9a0507810deb628..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S V;fKY~?*OG4JYD@<);T3K0RRlcSK|Nx diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_12.png deleted file mode 100644 index a44645458934ca46f8081ee98599604506092c77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S UQRb>`X+UWPPgg&ebxsLQ0Q?eGy#N3J diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_13.png deleted file mode 100644 index 1bd4aeffe4542db42c62bdc0b3473172dac8c34c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S UvE16W4?t-KPgg&ebxsLQ0Q>@0&;S4c diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_14.png deleted file mode 100644 index 98bfe268d9a6a5b87b83a9f2ca8a339ddf4d2d13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S UNyACuV4yUEr>mdKI;Vst0QHnsKL7v# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_15.png deleted file mode 100644 index 1f52cafc7ffd7e72c6eb292360a6e621f664cbfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p>e#S U>GyNWM}g7|p00i_>zopr00bFVJ^%m! diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_2.png deleted file mode 100644 index 0fabc59be65a8f65a0e0a719b0eafdaa5ffcbe1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#C TmH19upe%!@tDnm{r-UW|naEY6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_3.png deleted file mode 100644 index a215aba5d2987080c0e1e54359ac8d60c4ff4069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#i TuR!N&pe%!@tDnm{r-UW|ot9PZ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_4.png deleted file mode 100644 index 9f75b8274d0a581656b013a8148e1dcfd0f66cd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#) T!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e$F Tl46~CKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#K TZB?xbP?o{d)z4*}Q$iB}n|xKc diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_7.png deleted file mode 100644 index f1a188f10005d53aadd665ae22a5d7fbe24a751a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#q TSFP_Rpe%!@tDnm{r-UW|p&(W# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_13_8.png deleted file mode 100644 index 0eb67be70f0a9003c8545869f23496209ec4a53e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e#$ TtwRCIKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p>e$B T+M@|ufwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^K T#jtZzfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^q TvcP{#Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UfmHGP&p>GgPgg&ebxsLQ0RAFY`~Uy| diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_11.png deleted file mode 100644 index ce0fdfc6e0eac2f33f7a6f4a64160028870ffa15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UVQ$I&RG>72r>mdKI;Vst0Q+24vj6}9 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_12.png deleted file mode 100644 index d13299b53efb1df8fc5ca006add9d559c60dfbad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< U(U;o3`#@<1Pgg&ebxsLQ00uW#Z2$lO diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_13.png deleted file mode 100644 index 68c005d52dafec296b2d5448fe23f7d7c90225a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UadXu^PoOk|r>mdKI;Vst0Qvq_lmGw# diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_14.png deleted file mode 100644 index 25c5be6c6ec7937dd7a35f1fde227a8565e05f25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UiL9LVE1)!kr>mdKI;Vst0Pb#8;Q#;t diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_15.png deleted file mode 100644 index 662705b1457662693c271286fbdab6f7f08a5f9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p-H@< UX_lmP4N#iF)78&qol`;+0PK!ctN;K2 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_2.png deleted file mode 100644 index 187427eaa2b513f1e11b3b2c45b6c13f722debec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H@v TeZ=}5Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^4 TNBn#}pe%!@tDnm{r-UW|oYhs* diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_4.png deleted file mode 100644 index 4706c071533d4d2efe97894f0d04e13da00dc1a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^S THEXV3pe%!@tDnm{r-UW|pjTE0 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_5.png deleted file mode 100644 index f3d35d7ee8e235986cbfdf9a0b8e7e75354b2f80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^y TLK`b-pe%!@tDnm{r-UW|nf+Cg diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_6.png deleted file mode 100644 index 0c9dd3a4c7c6eea138609e3cfe7f8d2b08afe931..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H@% Tg=zLepe%!@tDnm{r-UW|oRL-9 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_7.png deleted file mode 100644 index 0a5c939dbe9fb6f2d1a48b9879cc1e673b9e9f85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^C TzfrU~P?o{d)z4*}Q$iB}m!nm6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_14_8.png deleted file mode 100644 index 54fd38017eb000a5bc78d85ebb6212fa692c454e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^O T{a&|aKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p-H^u Uimo!C9~l@tUHx3vIVCg!0Hd5%JOBUy diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_0.png deleted file mode 100644 index 3532d0b61e3f53e5437708e8600fe7c61d597529..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFq Ug(*uG17#UJUHx3vIVCg!0Ir8u2LJ#7 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_1.png deleted file mode 100644 index ca12dfedcc383e1cfcbaf05a10c41d1930f0489a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rF~ T^2t+7fwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U!J_jW(}2zopr00GWd9RL6T diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_11.png deleted file mode 100644 index 84628987f028a822bf571739f026c3112603fe6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U;nfp6fU*n>p00i_>zopr0RNd*!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK Ukzopr00Q7wKmY&$ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_13.png deleted file mode 100644 index 78df1be9694cfca226f06eb9bbaf9288f55bf526..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK UvGuW=IzVX#Pgg&ebxsLQ0Qv`3mjD0& diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_14.png deleted file mode 100644 index e94024118a06458170978828a0494a0253aa0a8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U$D$v;Y7A diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_15.png deleted file mode 100644 index 47c276b429fc67916e35777da8aafbe18244af6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``VUP`JnK`L>iMgp(B|rv)p=rFK U>7}JLl0az&Pgg&ebxsLQ0Q;R*p8x;= diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_2.png deleted file mode 100644 index 2d8e97d0a9442746709b92f813a8638f1a856d72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rF4 T-K?YiKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFa T=iIN7Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFy T^`8m5fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rG7 Tf`0)zKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFC T<#)zuKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFi T-v>jWBm;w|tDnm{r-UW|ov~HY diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_15_8.png deleted file mode 100644 index bcbf5c8da1da2b7a96dcc267b916c570fc7b6241..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rFu TJ%62vKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)p=rG3 TN)H)!pe%!@tDnm{r-UW|nBY}; diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_10.png deleted file mode 100644 index 87dd969bdab9fa6ac259b5c32079ac96e775b491..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5P1 T-l{b!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5QC Ts_` diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_12.png deleted file mode 100644 index 0e2f0a6fb7cef4380ae79b200d4624c1c6571794..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5PH T!;-TBKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5R7 U_r-sY0c9CHUHx3vIVCg!0JxG@xBvhE diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_14.png deleted file mode 100644 index 84ebf182e9d8d163cbebe82447096fffdc7601c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5P9 T=JAYFpe%!@tDnm{r-UW|q|8=X diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_15.png deleted file mode 100644 index 261bf8cf712baf07527740c2704b94b3d48f9b08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)VZ5QK T+<}PCKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c$0mr R!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c+-<> S^?_bvVDNPHb6Mw<&;$TfGgfE- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_6.png deleted file mode 100644 index 13fca032122fd42cbcce130eb5bcfd540a158119..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c(Z^d RbxJ@<22WQ%mvv4FO#n)PRlooM diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_7.png deleted file mode 100644 index aef843fb548b9a55fd23dab5ec71dd3239e7fb11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1cysl| Rep`T&44$rjF6*2UngC3_Rrvq_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_8.png deleted file mode 100644 index 525d731b073af27c3c4e4266a72ca90f733e0df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c#G{a R!Ky$>22WQ%mvv4FO#nvdRe1ma diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_9.png deleted file mode 100644 index 6e14b4bf4175beb31b8e53591e2b09d5d9fba3fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u1c*_IQ R$(w!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{o+ TjXd)tpe%!@tDnm{r-UW|n737l diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_11.png deleted file mode 100644 index 8df2fee4fcab5fcf6100df0227c72b451739729c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{oc Tw}deZP?o{d)z4*}Q$iB}jJZ^_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_12.png deleted file mode 100644 index 2a122e355a6c47755a8358f52b3ffa88564d81b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{qi TB*CP8Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{q? TQ?Vcope%!@tDnm{r-UW|o#R!} diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_14.png deleted file mode 100644 index 4db901d45b837fcb84ca37aea56755cef52046ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{o^ Tb!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)QM{ok TPw97Ape%!@tDnm{r-UW|o_$sG diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_8.png deleted file mode 100644 index cce2df6ad5f85a3605dc8e39607ccdf0627bc587..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tsc#Ex3 RZ)<>(44$rjF6*2UngCZ+R;K^} diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_9.png deleted file mode 100644 index ea7093bdc120b5b1ba36ddf14ea5632e8889ff0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tsc*{ev ScV7V|89ZJ6T-G@yGywoz7*`em diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_10.png deleted file mode 100644 index d7ef35be3d9df240a64f55b62d66c87b75e0e3a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE0y Tk;N(BfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE17 T<|QGCKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE0C T)>_uvKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alD~% U>?%{BzZn=jUHx3vIVCg!0G@7D<^TWy diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_14.png deleted file mode 100644 index 4bd7c7f9586f4d19a047c3c503bae10757c67468..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE0) U;d2Y#0c9CHUHx3vIVCg!0JQ>FeE!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)alE1F TmXi}IfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc+*pw SzrO(`89ZJ6T-G@yGywoyn^zG4 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_6.png deleted file mode 100644 index b88ba52ba9e8fcb2bdc41d19226c7b1db0c81208..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc(Y)I RRX#vT22WQ%mvv4FO#nxwRhIw& diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_7.png deleted file mode 100644 index 4f846e40136e84a53533f3b9db1423cbd66b02f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXcykr? RS+{_a44$rjF6*2UngC0MRqg-) diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_8.png deleted file mode 100644 index 4ad03d3052853f1bcd4f2c7c6280d89bbe15d9fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc#ADF R+P#6244$rjF6*2UngCMhR!#r_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_9.png deleted file mode 100644 index 5b1ac9859a51e6508b84bd5c43b6383efae793e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uXc+11{ Sx8DUyGI+ZBxvX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY#! TWJ!!4P?o{d)z4*}Q$iB}ofK8l diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_11.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_11.png deleted file mode 100644 index 26d850b028bceea2e44327fc408d737f85d84cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY$< TUUAM1pe%!@tDnm{r-UW|qDWRj diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_12.png deleted file mode 100644 index d96fca6b2be707307e9ff51a6e3dafec7d24e8c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY%a T_A1*Xpe%!@tDnm{r-UW|qQX`! diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_13.png deleted file mode 100644 index 2e1c5139d721c176f2bb4fc9b02dc7c5d1006b3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY%) Tfm+@#Kv@P)S3j3^P6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_14.png deleted file mode 100644 index ed7b4d985bfdfbc26eaaaa9fef4b0b29f87ced28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY#+ ToaBsfpe%!@tDnm{r-UW|oDfyT diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_15.png deleted file mode 100644 index a2aa5a7278124af601166854ce5a12de25fb608a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)NxY${ Trre5yKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc+>M~ SZ-EYFVDNPHb6Mw<&;$TkCRW1$ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_6.png deleted file mode 100644 index d4de37bfcfcfd17dc04e03c872fa016230850ebc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc(btl RJtu*Z44$rjF6*2UngCPYR(Svb diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_7.png deleted file mode 100644 index aff9cd926d847221c0e63f729263ae50b273464d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tccyq;! Ro_L@ngQu&X%Q~loCICn@Ripp_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_8.png deleted file mode 100644 index 4e996426816a92a0bc3cf657dd56fc1783d83366..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc#DnK SC!PaJGI+ZBxvX!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tcc*|oK S7DfOi89ZJ6T-G@yGywoviB`b? diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_10.png deleted file mode 100644 index 619aafb41f7e0071c2dcd80bf33f12fcee9d4953..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qDq T!xPrpKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qD~ TwDa71fwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qBk T|FI}`pe%!@tDnm{r-UW|nZZ?* diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_13.png deleted file mode 100644 index c371cf38144a85c69b396d052726d2ace976fd04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qCv T#lftJKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qDy Tv!(xyfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)X}qE7 U#6{!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHc(d@e S*Zu(|89ZJ6T-G@yGywoxz*h(W diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_7.png deleted file mode 100644 index b23c250018010eb010fae7987df98b6a7730fbe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHcyonS R&oY3L44$rjF6*2UngCIDR!IN= diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_8.png deleted file mode 100644 index bd28242b4bbe3ad1670278f7afc37e8d8f169f13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHc#939 SzkdQH89ZJ6T-G@yGywowPgd&y diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_9.png deleted file mode 100644 index e6ef05401d2a0138e8053c0d375cd9979e5ee8f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uHc+2BL Rr}Kf544$rjF6*2UngCJ(Rz?5- diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_0.png deleted file mode 100644 index ce8aa530d69945f085c2f1894372b40772f2493b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c!ND1 SXD0zA89ZJ6T-G@yGywovm{!gJ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_1.png deleted file mode 100644 index d981ccec9df1bc43c28842ad46fc9828f9fccc9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c*E2E Re_4Q%44$rjF6*2UngCX8R)+up diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_10.png deleted file mode 100644 index ce8f7ab87891e18f57097ad343a64fd46888ed52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hda T=h`VpfwByqu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hcP TOVyHKpe%!@tDnm{r-UW|q=;5i diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_12.png deleted file mode 100644 index 12b29e494424596838fe48ce732267cdb27a5669..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hc< TZ1Go+{~0`8{an^LB{Ts5smxZ* diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_13.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_13.png deleted file mode 100644 index 832731fa5c3fba97fcc3d0be59aad84d10435fc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hcf TR>{$Npe%!@tDnm{r-UW|rn**w diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_14.png deleted file mode 100644 index 0c2c6ce19442d1615534f3ca781da5a441bde46d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hdi T7lD8~Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)S-hcX Tvv`6RP?o{d)z4*}Q$iB}n!;74 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_2.png deleted file mode 100644 index 340c29731b0c5812935049e053b78a8310aaf2b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c%z`U RHT!^)44$rjF6*2UngCO3R&M|R diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_3.png deleted file mode 100644 index 4698d4385983c16e01e82bcc4ed881fcc32f013b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=Y7G zC&V?|zW!SMe;`ju>HovqA%}r1#w2fd7iK{oACPUF1s;*b3=G`DAk4@xYmNj^P|VZC zF@)oKasmV6#S0e#Y+SVBB1M=OqCW`OJ~IuT092t`;u=wsl30>zm0Xkxq!^4042^UR z4Rno6LW~Tp3`~JY*TBTez~I5eKPON$MSHb`Q diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_4.png deleted file mode 100644 index 145baf3046180be3e30c5c569ab9bd98ecb23f65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c$3{v RIlF<944$rjF6*2UngCQRR$~AF diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_5.png deleted file mode 100644 index f5baaafea67bb5f28f5336bc49ee882ea85ae582..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c+)eF REM!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c(c&g R8Owo^44$rjF6*2UngCShR)7Ei diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_7.png deleted file mode 100644 index 355900626218c1e41a685751805b172ddd778b20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+cypyU R5r#lX22WQ%mvv4FO#n*xRmlJV diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_8.png deleted file mode 100644 index e6c493a207a158be352d4d1a6b2fa58a2fdc1a2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c#BQJ Rt_y&Y44$rjF6*2UngCC$RviEU diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_6_9.png deleted file mode 100644 index 88b41a829d3b8adef10f7f2d0d852e7f91672e2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8t+c*~<9 RrDi}$22WQ%mvv4FO#n_gRrmk^ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_0.png deleted file mode 100644 index 50cd9b81e0271c7beef417abd052ad92407365aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc!RxO S%a;Nr89ZJ6T-G@yGywoq{8oPe diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_1.png deleted file mode 100644 index c21340109364da04064199f5e268726c78048f47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc*9e^ R(~W_W44$rjF6*2UngCB=Rt^9F diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_10.png deleted file mode 100644 index 3d20299ef88f903842942540888e3eedb07324b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;4 T_rcE#fU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;a T&9TE~Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;~ T(({vgfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;C T&l>ZcKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)dAy;i T^=fu~pe%!@tDnm{r-UW|n8j6p diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_2.png deleted file mode 100644 index 4bac0ee42374fd6f6e2ff4301ab44c21702a36a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc%xvK RW1T=r22WQ%mvv4FO#n`6RuljL diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_3.png deleted file mode 100644 index 02772c08e64f59d13fbfd9af8ac4ad6f7acd5f3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uncw-gk RZ}LD%22WQ%mvv4FO#n!`RjU91 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_4.png deleted file mode 100644 index 915af8bafa624836fce8883adea05e61e6420be6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc#~b~ R$$Nm344$rjF6*2UngCFCRxkhn diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_5.png deleted file mode 100644 index f508aa62b4dfdfe80f32db969d298382b1920aff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc+;~A R!CF8`22WQ%mvv4FO#n#*Rhs|+ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_6.png deleted file mode 100644 index 7329097517a83b4c36b69759b738bf7605df30a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc(V{q RrU^hv22WQ%mvv4FO#nj7RY3p% diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_7.png deleted file mode 100644 index 5b1a33fda38c72f4b222111533ce2f7256cd31de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8uncynbv RBQ~HUgQu&X%Q~loCICCORJ;HH diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_8.png deleted file mode 100644 index 6bf8b31ce549259563598f7abe6e8ed305de7eec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc#F*w S^``?R89ZJ6T-G@yGywon$5uW7 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_7_9.png deleted file mode 100644 index 1584355e27bcdd6d21e3d28fb953497bc226c538..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8unc*`Tx R!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc!O!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc*BE& R7x;jZ44$rjF6*2UngC3kRo(yq diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_10.png deleted file mode 100644 index a2622d01fe7c769c5f1ac1f8cef3158e35694074..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSb T@S?}xfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBS5 T%F@dTKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBTW T-!)CQfU*ppu6{1-oD!M!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSL T*Xm6^Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSj T$a(emKv@P)S3j3^P6 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_15.png deleted file mode 100644 index 4939b0b5bc72750749a8bee2ac6a6e8e030ba9b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)MZBSD T@(J-upe%!@tDnm{r-UW|p{`aR diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_2.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_2.png deleted file mode 100644 index eb29b886380d9b06ca797783529e020786fa4420..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc%ul3 R#w|ce22WQ%mvv4FO#n)wRn!0g diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_3.png deleted file mode 100644 index fb83c41dcf725edeaa9ab398a9f038ba9dc93edb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUcw>F} RjY>dC22WQ%mvv4FO#nl}RZ#!{ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_4.png deleted file mode 100644 index 6a3c5a27862e9d843fe2c9403c05d63012b38f21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc$1CQ RDvdx%22WQ%mvv4FO#n`GRssM3 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_5.png deleted file mode 100644 index d37b1bf2bd226b1ea876ce0edfcb275af6c3484c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc++Dw RBH}!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc(eFY R*R?=N22WQ%mvv4FO#n?MRrvq_ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_7.png deleted file mode 100644 index 2b0c02fbf2d9e116d00cc14eb92377903bf183b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUcyo=S RQfr_jgQu&X%Q~loCICioRek^f diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_8.png deleted file mode 100644 index 598dcc5182d7a54b888b38bca01f0a7fca9342ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc#9op SGgbj589ZJ6T-G@yGywov!&b}y diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_8_9.png deleted file mode 100644 index cf466a1b7a9d43699bd347989e2a1478177a16c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8tUc+2yr RB0yeZ@O1TaS?83{1OQZ_R$~AF diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_0.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_0.png deleted file mode 100644 index 030b4a0b1f6c511466aee84b81c1c70a14ae3da1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c!TX% Sy4C|F89ZJ6T-G@yGywox#8&bE diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_1.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_1.png deleted file mode 100644 index e2d6199d5776a9e20b805d673d185428f7c1fb3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c*6si ScUb}@89ZJ6T-G@yGywou_*S(5 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_10.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_10.png deleted file mode 100644 index cce6f65dbf142729a35dc77bbdb7cb01812956fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!m TYPpulKv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!` T9my@Az+mun^>bP0l+XkKp?_8n diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_12.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_12.png deleted file mode 100644 index 540445ba0f176fd938e95809e26ac33430bbb16f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!0 TtH9I!Kv@P)S3j3^P6!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!W Tk@!_jpe%!@tDnm{r-UW|nuS%W diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_14.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_14.png deleted file mode 100644 index cde147bdcf34862090116ecb92ee2ac598b99d21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS!u Tnqr48pe%!@tDnm{r-UW|q+wP~ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_15.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_15.png deleted file mode 100644 index c09b5acade4952e7e59c0a02f666e9ca0acae834..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlB``A&?DenK`L>iMgp(B|rv)WxS#3 T?UDi+pe%!@tDnm{r-UW|q!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c%#T$ RubY9A44$rjF6*2UngCgHR?z?e diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_3.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_3.png deleted file mode 100644 index c4c5cc66add048302b9ee3a351f49b4bc07baa8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9cw@c0 Rw?%=H44$rjF6*2UngCFWRxAJj diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_4.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_4.png deleted file mode 100644 index 5e55c92141eada308b01db06d4d6753ad0bdb90b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c#{n~ S{k8!m89ZJ6T-G@yGywot7FM4C diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_5.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_5.png deleted file mode 100644 index 4d8a43f77c76a078461d3b271e468fe61a34bb0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c+=zi R>J)&I44$rjF6*2UngCPeR#pH2 diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_6.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_6.png deleted file mode 100644 index 8435594951fbd4d9358b669d24165c2dd44df82b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c(b_e R`m=zN44$rjF6*2UngCARRuTXJ diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_7.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_7.png deleted file mode 100644 index 8a872b5ae3aafabf93675f3d3ff52931e56b4dd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9cyrAS R@;pFE22WQ%mvv4FO#nk4RXG3v diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_8.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_8.png deleted file mode 100644 index 3314e05bcccc2e8ceb34209092276922d470d878..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c#EC< ROml&f44$rjF6*2UngB?LRh<9; diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_9.png b/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_9_9.png deleted file mode 100644 index 69f75ceb8debef7f7672a9b526692d47b0874320..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YhS zC&V?|zW!SMeY_ zS{axEk*m4U&7iGNO@Xvob^$xN%ntzqIBmlBZmARE#$b5ipXb5pHKfD8u9c*}Df RM%+M222WQ%mvv4FO#no-RZ0K= diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_0.png b/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_1.png b/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_2.png b/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_3.png b/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_4.png b/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guiicons_0_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_5.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_5.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_5.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_5.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_6.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_6.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_6.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_6.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_7.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_7.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_7.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_7.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_8.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_8.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_8.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_8.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_9.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_9.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_0_9.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_9.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_1_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_5.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_5.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_5.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_5.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_6.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_6.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_6.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_6.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_7.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_7.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_2_7.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_7.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_3_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_4_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_0.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_1.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_1.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_2.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_2.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_3.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_3.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_4.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_4.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_5.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_5.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/guitriggers_5_5.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_5_5.png From 04726b05c134a6027848593244d91e5ae335ad02 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 9 Mar 2013 17:51:18 +0100 Subject: [PATCH 09/93] Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update --- common/buildcraft/factory/BlockFrame.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 0f017e98..22521dae 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -106,41 +106,41 @@ public class BlockFrame extends Block implements IFramePipeConnection { public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int i, int j, int k) { return getCollisionBoundingBoxFromPool(world, i, j, k); } - + @SuppressWarnings("rawtypes") @Override - public void getCollisionBoxes(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { + public void addCollisionBoxesToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); if (Utils.checkLegacyPipesConnections(world, i, j, k, i - 1, j, k)) { setBlockBounds(0.0F, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i + 1, j, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, 1.0F, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j - 1, k)) { setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j + 1, k)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j, k - 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, 0.0F, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } if (Utils.checkLegacyPipesConnections(world, i, j, k, i, j, k + 1)) { setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, 1.0F); - super.getCollisionBoxes(world, i, j, k, axisalignedbb, arraylist, par7Entity); + super.addCollisionBoxesToList(world, i, j, k, axisalignedbb, arraylist, par7Entity); } setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); From 52b7ce7d36430e2f831de1a7260e0687f5fbea5d Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 9 Mar 2013 19:43:33 +0100 Subject: [PATCH 10/93] Fixed Action/Trigger textures --- ...4_4.png => action_machinecontrol_loop.png} | Bin ..._4_3.png => action_machinecontrol_off.png} | Bin ...s_4_2.png => action_machinecontrol_on.png} | Bin ...rs_1_0.png => trigger_engineheat_blue.png} | Bin ...s_1_1.png => trigger_engineheat_green.png} | Bin ...ers_1_3.png => trigger_engineheat_red.png} | Bin ..._1_2.png => trigger_engineheat_yellow.png} | Bin ...2_5.png => trigger_inventory_contains.png} | Bin ...rs_2_4.png => trigger_inventory_empty.png} | Bin ...ers_2_7.png => trigger_inventory_full.png} | Bin ...rs_2_6.png => trigger_inventory_space.png} | Bin ...g => trigger_liquidcontainer_contains.png} | Bin ....png => trigger_liquidcontainer_empty.png} | Bin ...3.png => trigger_liquidcontainer_full.png} | Bin ....png => trigger_liquidcontainer_space.png} | Bin ...ers_4_0.png => trigger_machine_active.png} | Bin ...s_4_1.png => trigger_machine_inactive.png} | Bin ...> trigger_pipecontents_containsenergy.png} | Bin ...=> trigger_pipecontents_containsitems.png} | Bin ...> trigger_pipecontents_containsliquid.png} | Bin ...3_0.png => trigger_pipecontents_empty.png} | Bin ...png => trigger_pipesignal_blue_active.png} | Bin ...g => trigger_pipesignal_blue_inactive.png} | Bin ...ng => trigger_pipesignal_green_active.png} | Bin ... => trigger_pipesignal_green_inactive.png} | Bin ....png => trigger_pipesignal_red_active.png} | Bin ...ng => trigger_pipesignal_red_inactive.png} | Bin ...g => trigger_pipesignal_yellow_active.png} | Bin ...=> trigger_pipesignal_yellow_inactive.png} | Bin ...0.png => trigger_redstoneinput_active.png} | Bin ...png => trigger_redstoneinput_inactive.png} | Bin common/buildcraft/api/gates/ITrigger.java | 2 +- common/buildcraft/api/gates/Trigger.java | 2 +- .../core/triggers/ActionMachineControl.java | 33 ++++----- .../core/triggers/ActionRedstoneOutput.java | 15 ++-- .../core/triggers/TriggerInventory.java | 33 ++++----- .../core/triggers/TriggerLiquidContainer.java | 33 ++++----- .../core/triggers/TriggerMachine.java | 21 +++--- .../buildcraft/energy/TriggerEngineHeat.java | 33 ++++----- .../transport/IconItemConstants.java | 65 ++++++++++++++---- .../transport/TransportProxyClient.java | 35 +++++++++- .../transport/gui/GuiGateInterface.java | 2 +- .../triggers/ActionEnergyPulser.java | 15 ++-- .../triggers/ActionSignalOutput.java | 37 +++++----- .../triggers/TriggerPipeContents.java | 36 +++++----- .../transport/triggers/TriggerPipeSignal.java | 63 ++++++++--------- .../triggers/TriggerRedstoneInput.java | 21 +++--- 47 files changed, 262 insertions(+), 184 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_4_4.png => action_machinecontrol_loop.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_4_3.png => action_machinecontrol_off.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_4_2.png => action_machinecontrol_on.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_1_0.png => trigger_engineheat_blue.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_1_1.png => trigger_engineheat_green.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_1_3.png => trigger_engineheat_red.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_1_2.png => trigger_engineheat_yellow.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_5.png => trigger_inventory_contains.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_4.png => trigger_inventory_empty.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_7.png => trigger_inventory_full.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_6.png => trigger_inventory_space.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_1.png => trigger_liquidcontainer_contains.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_0.png => trigger_liquidcontainer_empty.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_3.png => trigger_liquidcontainer_full.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_2_2.png => trigger_liquidcontainer_space.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_4_0.png => trigger_machine_active.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_4_1.png => trigger_machine_inactive.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_3_3.png => trigger_pipecontents_containsenergy.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_3_1.png => trigger_pipecontents_containsitems.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_3_2.png => trigger_pipecontents_containsliquid.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_3_0.png => trigger_pipecontents_empty.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_5.png => trigger_pipesignal_blue_active.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_4.png => trigger_pipesignal_blue_inactive.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_7.png => trigger_pipesignal_green_active.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_6.png => trigger_pipesignal_green_inactive.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_3.png => trigger_pipesignal_red_active.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_2.png => trigger_pipesignal_red_inactive.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_9.png => trigger_pipesignal_yellow_active.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_8.png => trigger_pipesignal_yellow_inactive.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_0.png => trigger_redstoneinput_active.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/triggers/{guitriggers_0_1.png => trigger_redstoneinput_inactive.png} (100%) diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_loop.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_loop.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_off.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_off.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_on.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/action_machinecontrol_on.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_blue.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_blue.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_green.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_green.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_red.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_red.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_1_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_engineheat_yellow.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_5.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_contains.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_5.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_contains.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_empty.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_empty.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_7.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_full.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_7.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_full.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_6.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_space.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_6.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_inventory_space.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_contains.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_empty.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_full.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_2_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_liquidcontainer_space.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_4_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_machine_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsenergy.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsitems.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsliquid.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_containsliquid.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_3_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipecontents_empty.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_5.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_5.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_4.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_blue_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_7.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_7.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_6.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_6.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_green_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_3.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_2.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_red_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_9.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_9.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_8.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_8.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_pipesignal_yellow_inactive.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_0.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_active.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_1.png b/buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/triggers/guitriggers_0_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/triggers/trigger_redstoneinput_inactive.png diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java index 99067dc0..b7f10be3 100644 --- a/common/buildcraft/api/gates/ITrigger.java +++ b/common/buildcraft/api/gates/ITrigger.java @@ -13,7 +13,7 @@ public interface ITrigger { * Return the texture file for this trigger icon */ @SideOnly(Side.CLIENT) - public abstract Icon getTexture(); + public abstract Icon getTextureIcon(); /** * Return true if this trigger can accept parameters diff --git a/common/buildcraft/api/gates/Trigger.java b/common/buildcraft/api/gates/Trigger.java index 41df3f52..1f26b7e3 100644 --- a/common/buildcraft/api/gates/Trigger.java +++ b/common/buildcraft/api/gates/Trigger.java @@ -47,7 +47,7 @@ public abstract class Trigger implements ITrigger { */ @SideOnly(Side.CLIENT) @Override - public abstract Icon getTexture(); + public abstract Icon getTextureIcon(); /* * (non-Javadoc) diff --git a/common/buildcraft/core/triggers/ActionMachineControl.java b/common/buildcraft/core/triggers/ActionMachineControl.java index 811a6307..957fb495 100644 --- a/common/buildcraft/core/triggers/ActionMachineControl.java +++ b/common/buildcraft/core/triggers/ActionMachineControl.java @@ -1,7 +1,12 @@ package buildcraft.core.triggers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.Action; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconItemConstants; public class ActionMachineControl extends Action { @@ -17,20 +22,6 @@ public class ActionMachineControl extends Action { this.mode = mode; } - @Override - public int getIndexInTexture() { - switch (mode) { - case On: - return 4 * 16 + 2; - case Off: - return 4 * 16 + 3; - case Loop: - return 4 * 16 + 4; - default: - return 0; - } - } - @Override public String getDescription() { switch (mode) { @@ -46,8 +37,18 @@ public class ActionMachineControl extends Action { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTexture() { + switch (mode) { + case On: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_On]; + case Off: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_Off]; + case Loop: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_Loop]; + default: + return null; + } } } diff --git a/common/buildcraft/core/triggers/ActionRedstoneOutput.java b/common/buildcraft/core/triggers/ActionRedstoneOutput.java index c504d9b8..63df04f3 100644 --- a/common/buildcraft/core/triggers/ActionRedstoneOutput.java +++ b/common/buildcraft/core/triggers/ActionRedstoneOutput.java @@ -9,8 +9,13 @@ package buildcraft.core.triggers; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.Action; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconItemConstants; public class ActionRedstoneOutput extends Action { @@ -18,18 +23,14 @@ public class ActionRedstoneOutput extends Action { super(id); } - @Override - public int getIndexInTexture() { - return 0 * 16 + 0; - } - @Override public String getDescription() { return "Redstone Signal"; } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTexture() { + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active]; } } diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index a877e4c8..8dbdb111 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -9,17 +9,22 @@ package buildcraft.core.triggers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerDirectional; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; import buildcraft.core.utils.SidedInventoryAdapter; import buildcraft.core.utils.Utils; +import buildcraft.transport.IconItemConstants; public class TriggerInventory extends Trigger implements ITriggerDirectional { @@ -35,20 +40,6 @@ public class TriggerInventory extends Trigger implements ITriggerDirectional { this.state = state; } - @Override - public int getIndexInTexture() { - switch (state) { - case Empty: - return 2 * 16 + 4; - case Contains: - return 2 * 16 + 5; - case Space: - return 2 * 16 + 6; - default: - return 2 * 16 + 7; - } - } - @Override public boolean hasParameter() { if (state == State.Contains || state == State.Space) @@ -134,7 +125,17 @@ public class TriggerInventory extends Trigger implements ITriggerDirectional { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTextureIcon() { + switch (state) { + case Empty: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Empty]; + case Contains: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Contains]; + case Space: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Space]; + default: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Full]; + } } } diff --git a/common/buildcraft/core/triggers/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java index f46e5f4f..c767a26c 100644 --- a/common/buildcraft/core/triggers/TriggerLiquidContainer.java +++ b/common/buildcraft/core/triggers/TriggerLiquidContainer.java @@ -9,15 +9,20 @@ package buildcraft.core.triggers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconItemConstants; public class TriggerLiquidContainer extends Trigger { @@ -32,20 +37,6 @@ public class TriggerLiquidContainer extends Trigger { this.state = state; } - @Override - public int getIndexInTexture() { - switch (state) { - case Empty: - return 2 * 16 + 0; - case Contains: - return 2 * 16 + 1; - case Space: - return 2 * 16 + 2; - default: - return 2 * 16 + 3; - } - } - @Override public boolean hasParameter() { if (state == State.Contains || state == State.Space) @@ -137,7 +128,17 @@ public class TriggerLiquidContainer extends Trigger { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTextureIcon() { + switch (state) { + case Empty: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Empty]; + case Contains: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Contains]; + case Space: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Space]; + default: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Full]; + } } } diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 2cdc1c74..7bdf92ec 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -9,11 +9,16 @@ package buildcraft.core.triggers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; import buildcraft.core.IMachine; +import buildcraft.transport.IconItemConstants; public class TriggerMachine extends Trigger { @@ -25,14 +30,6 @@ public class TriggerMachine extends Trigger { this.active = active; } - @Override - public int getIndexInTexture() { - if (active) - return 4 * 16 + 0; - else - return 4 * 16 + 1; - } - @Override public String getDescription() { if (active) @@ -56,7 +53,11 @@ public class TriggerMachine extends Trigger { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTextureIcon() { + if (active) + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Active]; + else + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Inactive]; } } diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java index ad163e8c..4395093a 100644 --- a/common/buildcraft/energy/TriggerEngineHeat.java +++ b/common/buildcraft/energy/TriggerEngineHeat.java @@ -9,10 +9,15 @@ package buildcraft.energy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconItemConstants; public class TriggerEngineHeat extends Trigger { @@ -24,20 +29,6 @@ public class TriggerEngineHeat extends Trigger { this.stage = stage; } - @Override - public int getIndexInTexture() { - switch (stage) { - case Blue: - return 1 * 16 + 0; - case Green: - return 1 * 16 + 1; - case Yellow: - return 1 * 16 + 2; - default: - return 1 * 16 + 3; - } - } - @Override public String getDescription() { switch (stage) { @@ -64,7 +55,17 @@ public class TriggerEngineHeat extends Trigger { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTextureIcon() { + switch (stage) { + case Blue: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Blue]; + case Green: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Green]; + case Yellow: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Yellow]; + default: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Red]; + } } } diff --git a/common/buildcraft/transport/IconItemConstants.java b/common/buildcraft/transport/IconItemConstants.java index 1a14cd8f..50cb8bf0 100644 --- a/common/buildcraft/transport/IconItemConstants.java +++ b/common/buildcraft/transport/IconItemConstants.java @@ -2,22 +2,57 @@ package buildcraft.transport; public class IconItemConstants { - public static final int Gate = 0; - public static final int Gate_Iron_And = 1; - public static final int Gate_Iron_Or = 2; - public static final int Gate_Gold_And = 3; - public static final int Gate_Gold_Or = 4; - public static final int Gate_Diamond_And = 5; - public static final int Gate_Diamond_Or = 6; + public static final int Gate = 0; + public static final int Gate_Iron_And = 1; + public static final int Gate_Iron_Or = 2; + public static final int Gate_Gold_And = 3; + public static final int Gate_Gold_Or = 4; + public static final int Gate_Diamond_And = 5; + public static final int Gate_Diamond_Or = 6; - public static final int Autarchic_Gate = 7; - public static final int Autarchic_Gate_Iron_And = 8; - public static final int Autarchic_Gate_Iron_Or = 9; - public static final int Autarchic_Gate_Gold_And = 10; - public static final int Autarchic_Gate_Gold_Or = 11; - public static final int Autarchic_Gate_Diamond_And = 12; - public static final int Autarchic_Gate_Diamond_Or = 13; + public static final int Autarchic_Gate = 7; + public static final int Autarchic_Gate_Iron_And = 8; + public static final int Autarchic_Gate_Iron_Or = 9; + public static final int Autarchic_Gate_Gold_And = 10; + public static final int Autarchic_Gate_Gold_Or = 11; + public static final int Autarchic_Gate_Diamond_And = 12; + public static final int Autarchic_Gate_Diamond_Or = 13; + + + public static final int Action_MachineControl_On = 14; + public static final int Action_MachineControl_Off = 15; + public static final int Action_MachineControl_Loop = 16; + + public static final int Trigger_EngineHeat_Blue = 18; + public static final int Trigger_EngineHeat_Green = 19; + public static final int Trigger_EngineHeat_Yellow = 20; + public static final int Trigger_EngineHeat_Red = 21; + public static final int Trigger_Inventory_Empty = 22; + public static final int Trigger_Inventory_Contains = 23; + public static final int Trigger_Inventory_Space = 24; + public static final int Trigger_Inventory_Full = 25; + public static final int Trigger_LiquidContainer_Empty = 26; + public static final int Trigger_LiquidContainer_Contains = 27; + public static final int Trigger_LiquidContainer_Space = 28; + public static final int Trigger_LiquidContainer_Full = 29; + public static final int Trigger_Machine_Active = 30; + public static final int Trigger_Machine_Inactive = 31; + public static final int Trigger_PipeContents_Empty = 32; + public static final int Trigger_PipeContents_ContainsItems = 33; + public static final int Trigger_PipeContents_ContainsLiquid = 34; + public static final int Trigger_PipeContents_ContainsEnergy = 35; + public static final int Trigger_PipeSignal_Red_Active = 36; + public static final int Trigger_PipeSignal_Blue_Active = 37; + public static final int Trigger_PipeSignal_Green_Active = 38; + public static final int Trigger_PipeSignal_Yellow_Active = 39; + public static final int Trigger_PipeSignal_Red_Inactive = 40; + public static final int Trigger_PipeSignal_Blue_Inactive = 41; + public static final int Trigger_PipeSignal_Green_Inactive = 42; + public static final int Trigger_PipeSignal_Yellow_Inactive = 43; + public static final int Trigger_RedstoneInput_Active = 44; + public static final int Trigger_RedstoneInput_Inactive = 45; - public static final int MAX = 14; + public static final int MAX = 46; + } diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index 625ff26d..ad9520d1 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -168,6 +168,39 @@ public class TransportProxyClient extends TransportProxy { instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_gold_or"); instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_and"); instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_or"); - + + instance.itemIcons[IconItemConstants.Action_MachineControl_On] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_on"); + instance.itemIcons[IconItemConstants.Action_MachineControl_Off] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_off"); + instance.itemIcons[IconItemConstants.Action_MachineControl_Loop] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_loop"); + + instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Blue] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_blue"); + instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Green] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_green"); + instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Yellow] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_yellow"); + instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Red] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_red"); + instance.itemIcons[IconItemConstants.Trigger_Inventory_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_empty"); + instance.itemIcons[IconItemConstants.Trigger_Inventory_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_contains"); + instance.itemIcons[IconItemConstants.Trigger_Inventory_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_space"); + instance.itemIcons[IconItemConstants.Trigger_Inventory_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_full"); + instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_empty"); + instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_contains"); + instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_space"); + instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_full"); + instance.itemIcons[IconItemConstants.Trigger_Machine_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_active"); + instance.itemIcons[IconItemConstants.Trigger_Machine_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_inactive"); + instance.itemIcons[IconItemConstants.Trigger_PipeContents_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_empty"); + instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsItems] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsitems"); + instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsLiquid] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsliquid"); + instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsEnergy] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsenergy"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_active"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_inactive"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_active"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_inactive"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_active"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_inactive"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_active"); + instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); + instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_active"); + instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_inactive"); + } } diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index 54c45e94..8cb76973 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -62,7 +62,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { public Icon getTexture() { ITrigger trigger = pipe.getTrigger(slot); if (trigger != null) - return trigger.getTexture(); + return trigger.getTextureIcon(); else return null; } diff --git a/common/buildcraft/transport/triggers/ActionEnergyPulser.java b/common/buildcraft/transport/triggers/ActionEnergyPulser.java index 380aea0a..870b1e1b 100644 --- a/common/buildcraft/transport/triggers/ActionEnergyPulser.java +++ b/common/buildcraft/transport/triggers/ActionEnergyPulser.java @@ -1,7 +1,12 @@ package buildcraft.transport.triggers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.Action; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconItemConstants; public class ActionEnergyPulser extends Action { @@ -10,13 +15,9 @@ public class ActionEnergyPulser extends Action { } @Override - public int getIndexInTexture() { - return 4 * 16 + 0; - } - - @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTexture() { + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Active]; } @Override diff --git a/common/buildcraft/transport/triggers/ActionSignalOutput.java b/common/buildcraft/transport/triggers/ActionSignalOutput.java index d401d701..2febaf54 100644 --- a/common/buildcraft/transport/triggers/ActionSignalOutput.java +++ b/common/buildcraft/transport/triggers/ActionSignalOutput.java @@ -9,9 +9,14 @@ package buildcraft.transport.triggers; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.Action; import buildcraft.api.transport.IPipe; import buildcraft.core.DefaultProps; +import buildcraft.transport.IconItemConstants; public class ActionSignalOutput extends Action { @@ -23,22 +28,6 @@ public class ActionSignalOutput extends Action { this.color = color; } - @Override - public int getIndexInTexture() { - switch (color) { - case Red: - return 0 * 16 + 3; - case Blue: - return 0 * 16 + 5; - case Green: - return 0 * 16 + 7; - case Yellow: - return 0 * 16 + 9; - } - - return 0; - } - @Override public String getDescription() { switch (color) { @@ -56,7 +45,19 @@ public class ActionSignalOutput extends Action { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTexture() { + switch (color) { + case Red: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active]; + case Blue: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active]; + case Green: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active]; + case Yellow: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active]; + } + + return null; } } diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index 6aa90955..1bd4858e 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -9,15 +9,20 @@ package buildcraft.transport.triggers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; import buildcraft.transport.EntityData; import buildcraft.transport.ITriggerPipe; +import buildcraft.transport.IconItemConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; @@ -36,21 +41,6 @@ public class TriggerPipeContents extends Trigger implements ITriggerPipe { this.kind = kind; } - @Override - public int getIndexInTexture() { - switch (kind) { - case Empty: - return 3 * 16 + 0; - case ContainsItems: - return 3 * 16 + 1; - case ContainsLiquids: - return 3 * 16 + 2; - case ContainsEnergy: - return 3 * 16 + 3; - } - return 3 * 16 + 0; - } - @Override public boolean hasParameter() { switch (kind) { @@ -139,8 +129,18 @@ public class TriggerPipeContents extends Trigger implements ITriggerPipe { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTextureIcon() { + switch (kind) { + case Empty: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_Empty]; + case ContainsItems: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsItems]; + case ContainsLiquids: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsLiquid]; + case ContainsEnergy: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsEnergy]; + } + return null; } - } diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java index b007d137..7a167b30 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -9,11 +9,16 @@ package buildcraft.transport.triggers; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.Icon; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.api.transport.IPipe; import buildcraft.core.DefaultProps; import buildcraft.transport.ITriggerPipe; +import buildcraft.transport.IconItemConstants; import buildcraft.transport.Pipe; public class TriggerPipeSignal extends Trigger implements ITriggerPipe { @@ -28,35 +33,6 @@ public class TriggerPipeSignal extends Trigger implements ITriggerPipe { this.color = color; } - @Override - public int getIndexInTexture() { - if (active) { - switch (color) { - case Red: - return 0 * 16 + 3; - case Blue: - return 0 * 16 + 5; - case Green: - return 0 * 16 + 7; - case Yellow: - return 0 * 16 + 9; - } - } else { - switch (color) { - case Red: - return 0 * 16 + 2; - case Blue: - return 0 * 16 + 4; - case Green: - return 0 * 16 + 6; - case Yellow: - return 0 * 16 + 8; - } - } - - return 0; - } - @Override public boolean hasParameter() { return false; @@ -100,7 +76,32 @@ public class TriggerPipeSignal extends Trigger implements ITriggerPipe { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTextureIcon() { + if (active) { + switch (color) { + case Red: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active]; + case Blue: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active]; + case Green: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active]; + case Yellow: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active]; + } + } else { + switch (color) { + case Red: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Inactive]; + case Blue: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Inactive]; + case Green: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Inactive]; + case Yellow: + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Inactive]; + } + } + + return null; } } diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java index e3d3833b..399af203 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -9,10 +9,15 @@ package buildcraft.transport.triggers; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; import buildcraft.transport.ITriggerPipe; +import buildcraft.transport.IconItemConstants; import buildcraft.transport.Pipe; public class TriggerRedstoneInput extends Trigger implements ITriggerPipe { @@ -25,14 +30,6 @@ public class TriggerRedstoneInput extends Trigger implements ITriggerPipe { this.active = active; } - @Override - public int getIndexInTexture() { - if (active) - return 0 * 16 + 0; - else - return 0 * 16 + 1; - } - @Override public String getDescription() { if (active) @@ -50,7 +47,11 @@ public class TriggerRedstoneInput extends Trigger implements ITriggerPipe { } @Override - public String getTexture() { - return DefaultProps.TEXTURE_TRIGGERS; + @SideOnly(Side.CLIENT) + public Icon getTextureIcon() { + if (active) + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active]; + else + return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Inactive]; } } From 28754ac6da099090740868808b7d195a162e2788 Mon Sep 17 00:00:00 2001 From: SirSengir Date: Sun, 10 Mar 2013 17:38:16 +0100 Subject: [PATCH 11/93] Fixed rename. --- buildcraft_resources/build.number | 4 ++-- buildcraft_resources/build.xml | 2 +- buildcraft_resources/changelog/3.4.3 | 13 +++++++++++++ buildcraft_resources/changelog/3.4.4 | 6 ++++++ .../builders/gui/GuiBlueprintLibrary.java | 8 ++++---- 5 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 buildcraft_resources/changelog/3.4.3 create mode 100644 buildcraft_resources/changelog/3.4.4 diff --git a/buildcraft_resources/build.number b/buildcraft_resources/build.number index 395124d9..72d52022 100644 --- a/buildcraft_resources/build.number +++ b/buildcraft_resources/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Jan 26 10:14:15 CET 2013 -build.number=16 +#Fri Feb 22 17:54:19 CET 2013 +build.number=19 diff --git a/buildcraft_resources/build.xml b/buildcraft_resources/build.xml index 8661bebd..65fad00c 100644 --- a/buildcraft_resources/build.xml +++ b/buildcraft_resources/build.xml @@ -17,7 +17,7 @@ - + diff --git a/buildcraft_resources/changelog/3.4.3 b/buildcraft_resources/changelog/3.4.3 new file mode 100644 index 00000000..d538ef9f --- /dev/null +++ b/buildcraft_resources/changelog/3.4.3 @@ -0,0 +1,13 @@ + +# 3.4.3 + +- Added: Glass facades. (Krapht) +- Changed: Autoarchic gates now always pulse at a single, fast rate. (cpw) +- Bugfix: Vines now marked as soft blocks. (CovertJaguar) +- Bugfix: Prevented crash if world gen is disabled. (CovertJaguar) +- Bugfix: Fixed NPE when liquid in tank has ceased to exist. (Krapht) +- Bugfix: Fixed /buildcraft not working in SSP. (viper283) +- Bugfix: Fixed tank filling. (CovertJaguar) +- Bugfix: Pipe items now registered with FML. (CovertJaguar) +- Bugfix: Version check now threaded. (Pahimar) +- Localization: Several updates to locations. (Contributors) \ No newline at end of file diff --git a/buildcraft_resources/changelog/3.4.4 b/buildcraft_resources/changelog/3.4.4 new file mode 100644 index 00000000..ced0a87b --- /dev/null +++ b/buildcraft_resources/changelog/3.4.4 @@ -0,0 +1,6 @@ +# 3.4.4 + +- Changed: Improved pipe interaction, pipe selection. Gate GUI will only open if the actual gate has been clicked. (Player) +- Bugfix: Fixed pipes not respecting an inventory's maximum stack limit. (powercrystals) +- Bugfix: Fixed a possible endless look when interacting with inventories. (immibis) +- Bugfix: Fixed possible crash with other mods interacting with the advanced assembly table. (Player) \ No newline at end of file diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index 2b818761..233588ed 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -63,15 +63,15 @@ public class GuiBlueprintLibrary extends GuiBuildCraft { prevPageButton = new GuiButton(0, j + 100, k + 23, 20, 20, "<"); nextPageButton = new GuiButton(1, j + 122, k + 23, 20, 20, ">"); - controlList.add(prevPageButton); - controlList.add(nextPageButton); + buttonList.add(prevPageButton); + buttonList.add(nextPageButton); // if (library.owner.equals(player.username)) { deleteButton = new GuiButton(2, j + 100, k + 114, 25, 20, StringUtil.localize("gui.del")); - controlList.add(deleteButton); + buttonList.add(deleteButton); lockButton = new GuiButton(3, j + 127, k + 114, 40, 20, StringUtil.localize("gui.lock")); - controlList.add(lockButton); + buttonList.add(lockButton); if (library.locked) { lockButton.displayString = StringUtil.localize("gui.unlock"); } else { From 3b082dfddb60f56afeb4066b86cd2e883733751e Mon Sep 17 00:00:00 2001 From: Flow86 Date: Tue, 12 Mar 2013 09:53:10 +0100 Subject: [PATCH 12/93] fixes #648 --- .../transport/BlockGenericPipe.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 2f457097..e6580a3b 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -9,6 +9,7 @@ package buildcraft.transport; +import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.TreeMap; @@ -457,6 +458,32 @@ public class BlockGenericPipe extends BlockContainer { super.breakBlock(world, x, y, z, par5, par6); } + @Override + public ArrayList getBlockDropped(World world, int x, int y, int z, int metadata, int fortune) { + + if (CoreProxy.proxy.isRenderWorld(world)) + return null; + + ArrayList list = new ArrayList(); + + int count = quantityDropped(metadata, fortune, world.rand); + for (int i = 0; i < count; i++) { + Pipe pipe = getPipe(world, x, y, z); + + if (pipe == null) { + pipe = pipeRemoved.get(new BlockIndex(x, y, z)); + } + + if (pipe != null) { + if (pipe.itemID > 0) { + pipe.dropContents(); + list.add(new ItemStack(pipe.itemID, 1, damageDropped(metadata))); + } + } + } + return list; + } + @Override public String getTextureFile() { return DefaultProps.TEXTURE_BLOCKS; From 4ed51b55223ce051af00974945ddc77976704574 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 12 Mar 2013 15:43:39 -0400 Subject: [PATCH 13/93] A bunch of fixups. The code *runs*, but there's a lot of gfx issues to fix up. --- ..._2_15.png => advworkbenchtable_bottom.png} | Bin ...ck_3_14.png => advworkbenchtable_side.png} | Bin ...ock_3_15.png => advworkbenchtable_top.png} | Bin .../{block_3_4.png => architect_front.png} | Bin .../{block_3_0.png => architect_sides.png} | Bin .../{block_3_3.png => architect_top.png} | Bin .../{block_3_1.png => architect_top_neg.png} | Bin .../{block_3_2.png => architect_top_pos.png} | Bin .../textures/blocks/assemblytable_bottom.png | Bin 0 -> 627 bytes ...{block_6_11.png => assemblytable_side.png} | Bin .../{block_6_12.png => assemblytable_top.png} | Bin ...{block_2_12.png => autoWorkbench_side.png} | Bin .../{block_2_11.png => autoWorkbench_top.png} | Bin .../{block_3_7.png => builder_front.png} | Bin .../{block_3_5.png => builder_side.png} | Bin .../blocks/{block_3_6.png => builder_top.png} | Bin .../textures/blocks/laser_bottom.png | Bin 0 -> 627 bytes .../blocks/{block_2_13.png => laser_side.png} | Bin .../blocks/{block_2_14.png => laser_top.png} | Bin .../{block_3_8.png => library_side.png} | Bin .../textures/blocks/library_topbottom.png | Bin 0 -> 683 bytes .../{block_2_6.png => miningwell_back.png} | Bin .../{block_2_3.png => miningwell_front.png} | Bin .../{block_2_5.png => miningwell_side.png} | Bin .../{block_2_4.png => miningwell_top.png} | Bin .../blocks/{block_6_4.png => pump_bottom.png} | Bin .../blocks/{block_6_3.png => pump_side.png} | Bin .../blocks/{block_6_5.png => pump_top.png} | Bin .../{block_2_7.png => quarry_front.png} | Bin .../blocks/{block_2_9.png => quarry_side.png} | Bin .../blocks/{block_2_8.png => quarry_top.png} | Bin .../{block_6_0.png => tank_bottom_side.png} | Bin .../{block_6_1.png => tank_stacked_side.png} | Bin .../blocks/{block_6_2.png => tank_top.png} | Bin .../{block_5_2.png => blueprint_clean.png} | Bin .../{block_5_3.png => blueprint_used.png} | Bin .../items/{block_0_1.png => oil_bucket.png} | Bin .../{block_5_0.png => template_clean.png} | Bin .../{block_5_1.png => template_used.png} | Bin common/buildcraft/BuildCraftTransport.java | 7 ++-- .../buildcraft/builders/BlockArchitect.java | 20 ++++++--- .../builders/BlockBlueprintLibrary.java | 24 +++++++++-- common/buildcraft/builders/BlockBuilder.java | 24 +++++++---- common/buildcraft/builders/ItemBptBase.java | 14 ++++++- .../buildcraft/builders/ItemBptBluePrint.java | 28 ++++++++++--- .../buildcraft/builders/ItemBptTemplate.java | 21 ++++++++-- .../buildcraft/core/ItemRedstoneChipset.java | 32 ++++++++------ .../core/render/RenderEntityBlock.java | 24 ++++++++--- common/buildcraft/energy/BlockEngine.java | 11 +++++ common/buildcraft/energy/ItemBucketOil.java | 10 ++++- .../energy/render/RenderEngine.java | 6 ++- .../factory/BlockAutoWorkbench.java | 20 ++++++--- common/buildcraft/factory/BlockHopper.java | 17 +++++--- .../buildcraft/factory/BlockMiningWell.java | 24 +++++++---- common/buildcraft/factory/BlockPump.java | 34 +++++++++++---- common/buildcraft/factory/BlockQuarry.java | 27 ++++++++---- common/buildcraft/factory/BlockRefinery.java | 10 +++++ common/buildcraft/factory/BlockTank.java | 39 +++++++++++------- .../factory/render/RenderHopper.java | 6 ++- .../factory/render/RenderRefinery.java | 4 +- .../buildcraft/factory/render/RenderTank.java | 37 +++++++++-------- .../silicon/BlockAssemblyTable.java | 29 +++++++++---- common/buildcraft/silicon/BlockLaser.java | 25 +++++++++-- .../transport/BlockGenericPipe.java | 14 ++++++- common/buildcraft/transport/ItemFacade.java | 8 ++++ common/buildcraft/transport/ItemGate.java | 10 ++++- common/buildcraft/transport/ItemPipe.java | 12 +++++- 67 files changed, 397 insertions(+), 140 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_15.png => advworkbenchtable_bottom.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_14.png => advworkbenchtable_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_15.png => advworkbenchtable_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_4.png => architect_front.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_0.png => architect_sides.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_3.png => architect_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_1.png => architect_top_neg.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_2.png => architect_top_pos.png} (100%) create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_bottom.png rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_11.png => assemblytable_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_12.png => assemblytable_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_12.png => autoWorkbench_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_11.png => autoWorkbench_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_7.png => builder_front.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_5.png => builder_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_6.png => builder_top.png} (100%) create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/laser_bottom.png rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_13.png => laser_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_14.png => laser_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_3_8.png => library_side.png} (100%) create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/library_topbottom.png rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_6.png => miningwell_back.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_3.png => miningwell_front.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_5.png => miningwell_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_4.png => miningwell_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_4.png => pump_bottom.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_3.png => pump_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_5.png => pump_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_7.png => quarry_front.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_9.png => quarry_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_2_8.png => quarry_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_0.png => tank_bottom_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_1.png => tank_stacked_side.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_2.png => tank_top.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_5_2.png => blueprint_clean.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_5_3.png => blueprint_used.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_0_1.png => oil_bucket.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_5_0.png => template_clean.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_5_1.png => template_used.png} (100%) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_bottom.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_2_15.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_bottom.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_14.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_15.png b/buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_15.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/advworkbenchtable_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_4.png b/buildcraft_resources/mods/buildcraft/textures/blocks/architect_front.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_4.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/architect_front.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_0.png b/buildcraft_resources/mods/buildcraft/textures/blocks/architect_sides.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_0.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/architect_sides.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_3.png b/buildcraft_resources/mods/buildcraft/textures/blocks/architect_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_3.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/architect_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_1.png b/buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_neg.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_1.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_neg.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_2.png b/buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_pos.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_2.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/architect_top_pos.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_bottom.png b/buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4722beb1a03f1713b81d629d8995370a703a6228 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lxPg_ z32~Ja;o;`y2J*zk#aUTdm6Vi(g@pwK1jNL|L_|c`*w}b@c!Y$6SXfwid3l+cndRi< zL`6lVq@?8K<+Zi7IXF0&n3(kS_4)Yt1O){-IXP8TRT&u>`T6;|xVRJ)6eJ`hWMyR) z6&0xCbaySb-B8wRq zxP?HN@zUM8KS04bo-U3d5|>l^ZwfUT@VGwQFlDX60#N~h^1uJ(O>}Ku&ON7MIr+|# zdEeFLnK+a?L^~U%^z89q)b(dj_0r-z5+ZhE&n?00FIc!sn005fyy16Se{|#Ps@o6w z)xTIMUSoWH%hR9dt;Xp{-}Fs?eD+rc94?ypXH_1b#v-4p3#Enc=N?~NJ*_DCF!#N( zBN8wD?L9coW@X)xJT0?p|DPA!u^-r7UOrv?ALvfi64!{5l*E!$tK_0oAjM#0U}&ss zV5n9nO2Eg!yLw&Pk*ARs=V?9$nLj!{^MGJwd7(8A5 KT-G@yGywoB@UbQU literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_11.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_12.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/assemblytable_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_12.png b/buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_2_12.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_11.png b/buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_2_11.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/autoWorkbench_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_7.png b/buildcraft_resources/mods/buildcraft/textures/blocks/builder_front.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_7.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/builder_front.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_5.png b/buildcraft_resources/mods/buildcraft/textures/blocks/builder_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_5.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/builder_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/builder_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_6.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/builder_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/laser_bottom.png b/buildcraft_resources/mods/buildcraft/textures/blocks/laser_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4722beb1a03f1713b81d629d8995370a703a6228 GIT binary patch literal 627 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lxPg_ z32~Ja;o;`y2J*zk#aUTdm6Vi(g@pwK1jNL|L_|c`*w}b@c!Y$6SXfwid3l+cndRi< zL`6lVq@?8K<+Zi7IXF0&n3(kS_4)Yt1O){-IXP8TRT&u>`T6;|xVRJ)6eJ`hWMyR) z6&0xCbaySb-B8wRq zxP?HN@zUM8KS04bo-U3d5|>l^ZwfUT@VGwQFlDX60#N~h^1uJ(O>}Ku&ON7MIr+|# zdEeFLnK+a?L^~U%^z89q)b(dj_0r-z5+ZhE&n?00FIc!sn005fyy16Se{|#Ps@o6w z)xTIMUSoWH%hR9dt;Xp{-}Fs?eD+rc94?ypXH_1b#v-4p3#Enc=N?~NJ*_DCF!#N( zBN8wD?L9coW@X)xJT0?p|DPA!u^-r7UOrv?ALvfi64!{5l*E!$tK_0oAjM#0U}&ss zV5n9nO2Eg!yLw&Pk*ARs=V?9$nLj!{^MGJwd7(8A5 KT-G@yGywoB@UbQU literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_13.png b/buildcraft_resources/mods/buildcraft/textures/blocks/laser_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_2_13.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/laser_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_2_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/laser_top.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_2_14.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/laser_top.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_3_8.png b/buildcraft_resources/mods/buildcraft/textures/blocks/library_side.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_3_8.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/library_side.png diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/library_topbottom.png b/buildcraft_resources/mods/buildcraft/textures/blocks/library_topbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..0b061d1fd65ae5f7fcf9b02bd56e2583245335cd GIT binary patch literal 683 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l-L#E z6XFV_uN;v-w_obfW!>w?l`bEa`|!Z}>odnYXEm;$P(HIq{Ow(f7dMQbTs3%nS?|(e zxt}jxUfwdje_reM8TC`U#V#I_`SjTC%^mZ*=QOS!Q+RgW@caSkA1_^=UpM;l)ZyGd z$+P<;K0mR4ci-~K75(QojDNj${qe&2=PTD6CzKyv(s^;y|X;&-6k%(fVk4P=v1ejS0bBMe+x`|&ATJjcfN7=p4Pko`OlN|ri#5iP+MnlDdy`- zo?VFt4|ealr%}Lv^2>*on-cRyv%Yzq{&srSvq|~4o`2r`OMK!zuF$g7hde-cs+PD$ zl%yn> stage = new HashMap>(); + private HashMap stage = new HashMap(); - private int[] getDisplayLists(int liquidId, int damage, World world) { + private int[] getDisplayLists(LiquidStack liquid, World world) { - if (stage.containsKey(liquidId)) { - HashMap x = stage.get(liquidId); - if (x.containsKey(damage)) - return x.get(damage); - } else { - stage.put(liquidId, new HashMap()); + if (stage.containsKey(liquid)) { + return stage.get(liquid); } int[] d = new int[displayStages]; - stage.get(liquidId).put(damage, d); + stage.put(liquid, d); BlockInterface block = new BlockInterface(); - if (liquidId < Block.blocksList.length && Block.blocksList[liquidId] != null) { - block.texture = Block.blocksList[liquidId].getBlockTextureFromSideAndMetadata(0, damage); - } else if (Item.itemsList[liquidId] != null) { - block.texture = Item.itemsList[liquidId].getIconFromDamage(damage); - } else - return null; + block.texture = liquid.getRenderingIcon(); + Minecraft.getMinecraft().renderEngine.func_98187_b("/terrain.png"); for (int s = 0; s < displayStages; ++s) { d[s] = GLAllocation.generateDisplayLists(1); @@ -78,19 +77,21 @@ public class RenderTank extends TileEntitySpecialRenderer { TileTank tank = ((TileTank) tileentity); + String liquidName = tank.tank.getLiquidName(); LiquidStack liquid = tank.tank.getLiquid(); + LiquidStack refLiquid = LiquidDictionary.getCanonicalLiquid(liquidName); - if (liquid == null || liquid.amount <= 0 || liquid.itemID <= 0) + if (refLiquid == null || liquid.amount <= 0) return; - int[] displayList = getDisplayLists(liquid.itemID, liquid.itemMeta, tileentity.worldObj); + int[] displayList = getDisplayLists(refLiquid, tileentity.worldObj); if (displayList == null) return; GL11.glPushMatrix(); GL11.glDisable(2896 /* GL_LIGHTING */); - GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F); + GL11.glTranslatef((float) x, (float) y, (float) z); GL11.glCallList(displayList[(int) ((float) liquid.amount / (float) (tank.tank.getCapacity()) * (displayStages - 1))]); diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index 2711631e..313e3ef8 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,13 +22,15 @@ import buildcraft.core.utils.Utils; public class BlockAssemblyTable extends BlockContainer { + @SideOnly(Side.CLIENT) + private Icon[][] icons; + public BlockAssemblyTable(int i) { super(i, Material.iron); setBlockBounds(0, 0, 0, 1, 9F / 16F, 1); setHardness(0.5F); setCreativeTab(CreativeTabBuildCraft.tabBuildCraft); - } @Override @@ -65,13 +68,8 @@ public class BlockAssemblyTable extends BlockContainer { @Override public Icon getBlockTextureFromSideAndMetadata(int i, int j) { - if (i == 1) { - return j == 0 ? 16 * 6 + 12 : 16 * 3 + 15; - } else if (i == 0) { - return 16 * 2 + 15; - } else { - return j == 0 ? 16 * 6 + 11 : 16 * 3 + 14; - } + int s = i > 1 ? 2 : i; + return icons[j][s]; } @Override @@ -100,4 +98,19 @@ public class BlockAssemblyTable extends BlockContainer { par3List.add(new ItemStack(this, 1, 0)); par3List.add(new ItemStack(this, 1, 1)); } + + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + icons = new Icon[2][]; + icons[0] = new Icon[3]; + icons[1] = new Icon[3]; + icons[0][0] = par1IconRegister.func_94245_a("buildcraft:assemblytable_bottom"); + icons[1][0] = par1IconRegister.func_94245_a("buildcraft:advworkbenchtable_bottom"); + icons[0][1] = par1IconRegister.func_94245_a("buildcraft:assemblytable_top"); + icons[1][1] = par1IconRegister.func_94245_a("buildcraft:advworkbenchtable_top"); + icons[0][2] = par1IconRegister.func_94245_a("buildcraft:assemblytable_side"); + icons[1][2] = par1IconRegister.func_94245_a("buildcraft:advworkbenchtable_side"); + } } diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 3c964ff1..1a32d68c 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -11,10 +11,15 @@ package buildcraft.silicon; import java.util.ArrayList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.core.CreativeTabBuildCraft; @@ -22,6 +27,9 @@ import buildcraft.core.DefaultProps; public class BlockLaser extends BlockContainer { + @SideOnly(Side.CLIENT) + private Icon textureTop, textureBottom, textureSide; + public BlockLaser(int i) { super(i, Material.iron); setHardness(0.5F); @@ -58,13 +66,13 @@ public class BlockLaser extends BlockContainer { } @Override - public int getBlockTextureFromSideAndMetadata(int i, int j) { + public Icon getBlockTextureFromSideAndMetadata(int i, int j) { if (i == ForgeDirection.values()[j].getOpposite().ordinal()) - return 16 * 2 + 15; + return textureBottom; else if (i == j) - return 16 * 2 + 14; + return textureTop; else - return 16 * 2 + 13; + return textureSide; } @@ -84,4 +92,13 @@ public class BlockLaser extends BlockContainer { public void addCreativeItems(ArrayList itemList) { itemList.add(new ItemStack(this)); } + + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + textureTop = par1IconRegister.func_94245_a("buildcraft:laser_top"); + textureBottom = par1IconRegister.func_94245_a("buildcraft:laser_bottom"); + textureSide = par1IconRegister.func_94245_a("buildcraft:laser_side"); + } } diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 6c901a50..8eb52eee 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -18,6 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; @@ -41,6 +42,7 @@ import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.transport.render.PipeWorldRenderer; +import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; public class BlockGenericPipe extends BlockContainer { @@ -796,10 +798,13 @@ public class BlockGenericPipe extends BlockContainer { pipes.put(item.itemID, clas); Pipe dummyPipe = createPipe(item.itemID); - if (dummyPipe != null) { + if (dummyPipe != null && dummyPipe.getTextureIcons() != null) { item.setPipeIcon(dummyPipe.getTextureIcons()[dummyPipe.getIconIndexForItem()]); + } else if (dummyPipe != null) { + BuildCraftCore.bcLog.info("The pipe "+ dummyPipe + " is not returning icons"); } + return item; } @@ -852,4 +857,11 @@ public class BlockGenericPipe extends BlockContainer { public static boolean isValid(Pipe pipe) { return isFullyDefined(pipe); } + + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister par1IconRegister) + { + // NOOP we do this elsewhere + } } diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 2a6eb09e..6ac0de7e 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Set; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -146,4 +147,11 @@ public class ItemFacade extends ItemBuildCraft { AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(BuildCraftTransport.pipeStructureCobblestone, 3), itemStack }, 8000, new ItemStack(BuildCraftTransport.facadeItem, 6, ItemFacade.encode(itemStack.itemID, itemStack.getItemDamage())))); } + + @Override + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister par1IconRegister) + { + // NOOP + } } diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 5aa85d7d..355abeac 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -5,6 +5,7 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; @@ -36,7 +37,7 @@ public class ItemGate extends ItemBuildCraft { } else { n = 2; } - + if (series == 0){ //Normal Gates switch (i) { case 0: @@ -92,4 +93,11 @@ public class ItemGate extends ItemBuildCraft { itemList.add(new ItemStack(this, 1, 5)); itemList.add(new ItemStack(this, 1, 6)); } + + @Override + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister par1IconRegister) + { + // NOOP + } } diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index a6ee57ff..e8661462 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -12,6 +12,7 @@ package buildcraft.transport; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; @@ -84,14 +85,21 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { } else return false; } - + @SideOnly(Side.CLIENT) public Icon getPipeIcon(){ return iconIndex; } - + @SideOnly(Side.CLIENT) public void setPipeIcon(Icon icon){ this.iconIndex = icon; } + + @Override + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister par1IconRegister) + { + // NOOP + } } From ac7ab97353c37dcfbe3a4f70689431a6a781e406 Mon Sep 17 00:00:00 2001 From: Krapht Date: Wed, 13 Mar 2013 23:27:36 +0100 Subject: [PATCH 14/93] Facade items render the block part correctly, pipes still messed up Pipe render state defaults to dirty to trigger a sync when placing a pipe --- common/buildcraft/transport/ItemFacade.java | 7 +++++++ common/buildcraft/transport/PipeRenderState.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 6ac0de7e..7b2b184f 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -154,4 +154,11 @@ public class ItemFacade extends ItemBuildCraft { { // NOOP } + + @Override + @SideOnly(Side.CLIENT) + public int func_94901_k() + { + return 0; + } } diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index 017a8462..ca79c59e 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -24,7 +24,7 @@ public class PipeRenderState implements IClientState { public final FacadeMatrix facadeMatrix = new FacadeMatrix(); - private boolean dirty = false; + private boolean dirty = true; /* * This is a placeholder for the pipe renderer to set to a value that the BlockGenericPipe->TileGenericPipe will then return the the WorldRenderer From e2e47f0f814120e4af430b9deb2be72d1b1eef2d Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Thu, 14 Mar 2013 08:40:41 -0700 Subject: [PATCH 15/93] Tweaked Hopper fill speed --- common/buildcraft/factory/TileHopper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index 56ef8bda..d88e0949 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -34,7 +34,7 @@ public class TileHopper extends TileBuildCraft implements IInventory { @Override public void updateEntity() { super.updateEntity(); - if (CoreProxy.proxy.isRenderWorld(worldObj) || worldObj.getWorldTime() % 5 != 0) + if (CoreProxy.proxy.isRenderWorld(worldObj) || worldObj.getWorldTime() % 2 != 0) return; TileEntity tile = this.worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord); From 145e5df55729484a7db7f380239cb8fbb431a79b Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 15 Mar 2013 15:08:55 -0400 Subject: [PATCH 16/93] Delete getTextureFile from everything. It's gone. --- common/buildcraft/builders/BlockArchitect.java | 5 ----- common/buildcraft/builders/BlockBlueprintLibrary.java | 5 ----- common/buildcraft/builders/BlockBuilder.java | 5 ----- common/buildcraft/builders/BlockFiller.java | 5 ----- common/buildcraft/builders/BlockMarker.java | 5 ----- common/buildcraft/core/BlockBuildCraft.java | 5 ----- common/buildcraft/energy/BlockOilFlowing.java | 5 ----- common/buildcraft/energy/BlockOilStill.java | 5 ----- common/buildcraft/energy/BlockPollution.java | 5 ----- common/buildcraft/factory/BlockFrame.java | 5 ----- common/buildcraft/factory/BlockMiningWell.java | 5 ----- common/buildcraft/factory/BlockPlainPipe.java | 5 ----- common/buildcraft/factory/BlockPump.java | 5 ----- common/buildcraft/factory/BlockQuarry.java | 5 ----- common/buildcraft/factory/BlockTank.java | 5 ----- common/buildcraft/silicon/BlockAssemblyTable.java | 5 ----- common/buildcraft/silicon/BlockLaser.java | 5 ----- common/buildcraft/transport/BlockGenericPipe.java | 5 ----- 18 files changed, 90 deletions(-) diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 7197e3fc..6a4c8ba9 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -49,11 +49,6 @@ public class BlockArchitect extends BlockContainer { setCreativeTab(CreativeTabBuildCraft.tabBuildCraft); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public TileEntity createNewTileEntity(World var1) { return new TileArchitect(); diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 1aa7d680..d36a5a95 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -40,11 +40,6 @@ public class BlockBlueprintLibrary extends BlockContainer { setHardness(0.7F); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityplayer, int par6, float par7, float par8, float par9) { super.onBlockActivated(world, i, j, k, entityplayer, par6, par7, par8, par9); diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 7864ee04..a1176956 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -51,11 +51,6 @@ public class BlockBuilder extends BlockContainer { return new TileBuilder(); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public Icon getBlockTextureFromSideAndMetadata(int i, int j) { if (j == 0 && i == 3) diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 442d20a6..83c466a1 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -103,11 +103,6 @@ public class BlockFiller extends BlockContainer { super.breakBlock(world, x, y, z, par5, par6); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addCreativeItems(ArrayList itemList) { diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index afa793a6..0f131eb1 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -214,11 +214,6 @@ public class BlockMarker extends BlockContainer { return true; } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addCreativeItems(ArrayList itemList) { diff --git a/common/buildcraft/core/BlockBuildCraft.java b/common/buildcraft/core/BlockBuildCraft.java index b3d8e8e0..c0cb4705 100644 --- a/common/buildcraft/core/BlockBuildCraft.java +++ b/common/buildcraft/core/BlockBuildCraft.java @@ -24,9 +24,4 @@ public abstract class BlockBuildCraft extends BlockContainer { super.breakBlock(world, x, y, z, par5, par6); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - } diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index 41ed5af2..11f29ae4 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -38,11 +38,6 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { return BuildCraftCore.oilModel; } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - private void updateFlow(World world, int i, int j, int k) { int l = world.getBlockMetadata(i, j, k); world.setBlockAndMetadataWithNotify(i, j, k, blockID + 1, l, 1); diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index b34b596e..5245e302 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -31,11 +31,6 @@ public class BlockOilStill extends BlockStationary implements ILiquid { return BuildCraftCore.oilModel; } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public int stillLiquidId() { return BuildCraftEnergy.oilStill.blockID; diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index 9332b662..1b614222 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -26,11 +26,6 @@ public class BlockPollution extends BlockContainer { super(i, Material.air); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public boolean renderAsNormalBlock() { return false; diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 22521dae..eb621250 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -188,11 +188,6 @@ public class BlockFrame extends Block implements IFramePipeConnection { return blockAccess.getBlockId(x2, y2, z2) == blockID; } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addCreativeItems(ArrayList itemList) { diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 8b877291..c22e5368 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -81,11 +81,6 @@ public class BlockMiningWell extends BlockMachineRoot { return new TileMiningWell(); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addCreativeItems(ArrayList itemList) { diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index b5c7078c..4e798f12 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -62,11 +62,6 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { return false; } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - public float getHeightInPipe() { return 0.5F; } diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index d516dfbc..96a0e995 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -42,11 +42,6 @@ public class BlockPump extends BlockContainer { return new TilePump(); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public Icon getBlockTextureFromSideAndMetadata(int i, int j) { switch (i) { diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index d4a629c4..7b53c2fc 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -217,11 +217,6 @@ public class BlockQuarry extends BlockMachineRoot { return false; } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addCreativeItems(ArrayList itemList) { diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 1ee80fa2..7aa6da4e 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -63,11 +63,6 @@ public class BlockTank extends BlockContainer { return new TileTank(); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @SuppressWarnings({ "all" }) public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int l) { switch (l) { diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index 313e3ef8..e836ea6a 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -82,11 +82,6 @@ public class BlockAssemblyTable extends BlockContainer { return null; } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public int damageDropped(int par1) { return par1; diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 1a32d68c..30b36cfb 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -60,11 +60,6 @@ public class BlockLaser extends BlockContainer { return new TileLaser(); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public Icon getBlockTextureFromSideAndMetadata(int i, int j) { if (i == ForgeDirection.values()[j].getOpposite().ordinal()) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 8eb52eee..89ce45f4 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -460,11 +460,6 @@ public class BlockGenericPipe extends BlockContainer { super.breakBlock(world, x, y, z, par5, par6); } - @Override - public String getTextureFile() { - return DefaultProps.TEXTURE_BLOCKS; - } - @Override public TileEntity createNewTileEntity(World var1) { return new TileGenericPipe(); From c5ebbbdf48c9cfec25318c172bdd250d9f7427d5 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 16 Mar 2013 00:47:08 +0100 Subject: [PATCH 17/93] Fixed Pipes, Gates, Wires and several items Actions and Triggers remain --- .../items/{block_4_1.png => bluePipeWire.png} | Bin .../items/{block_0_3.png => bucketFuel.png} | Bin .../{block_1_4.png => diamondGearItem.png} | Bin .../items/{block_1_3.png => goldGearItem.png} | Bin .../{block_4_2.png => greenPipeWire.png} | Bin .../items/{block_1_2.png => ironGearItem.png} | Bin .../items/{block_4_0.png => redPipeWire.png} | Bin ...k_6_3.png => redstone_diamond_chipset.png} | Bin ...lock_6_2.png => redstone_gold_chipset.png} | Bin ...lock_6_1.png => redstone_iron_chipset.png} | Bin ...6_4.png => redstone_pulsating_chipset.png} | Bin ...block_6_0.png => redstone_red_chipset.png} | Bin .../{block_1_1.png => stoneGearItem.png} | Bin .../{block_1_0.png => woodenGearItem.png} | Bin .../items/{block_0_2.png => wrenchItem.png} | Bin .../{block_4_3.png => yellowPipeWire.png} | Bin common/buildcraft/BuildCraftTransport.java | 16 +- common/buildcraft/core/IIconProvider.java | 24 +++ common/buildcraft/core/ItemBuildCraft.java | 17 ++ .../buildcraft/core/ItemRedstoneChipset.java | 2 +- .../transport/BlockGenericPipe.java | 21 +- .../transport/GateIconProvider.java | 90 +++++++++ common/buildcraft/transport/GateVanilla.java | 28 +-- .../transport/IPipeRenderState.java | 7 +- .../transport/IconItemConstants.java | 14 -- .../transport/IconTerrainConstants.java | 82 -------- common/buildcraft/transport/ItemGate.java | 70 +++++-- common/buildcraft/transport/ItemPipe.java | 31 ++- common/buildcraft/transport/Pipe.java | 8 +- .../transport/PipeIconProvider.java | 111 +++++++++++ .../buildcraft/transport/PipeRenderState.java | 4 + .../buildcraft/transport/TileGenericPipe.java | 26 ++- .../buildcraft/transport/TransportProxy.java | 7 +- .../transport/TransportProxyClient.java | 183 ++++-------------- .../transport/WireIconProvider.java | 50 +++++ .../transport/pipes/PipeItemsCobblestone.java | 15 +- .../transport/pipes/PipeItemsDiamond.java | 28 ++- .../transport/pipes/PipeItemsEmerald.java | 25 +-- .../transport/pipes/PipeItemsGold.java | 16 +- .../transport/pipes/PipeItemsIron.java | 25 ++- .../transport/pipes/PipeItemsObsidian.java | 19 +- .../transport/pipes/PipeItemsSandstone.java | 15 +- .../transport/pipes/PipeItemsStone.java | 16 +- .../transport/pipes/PipeItemsVoid.java | 15 +- .../transport/pipes/PipeItemsWood.java | 17 +- .../pipes/PipeLiquidsCobblestone.java | 15 +- .../transport/pipes/PipeLiquidsEmerald.java | 6 +- .../transport/pipes/PipeLiquidsGold.java | 15 +- .../transport/pipes/PipeLiquidsIron.java | 17 +- .../transport/pipes/PipeLiquidsSandstone.java | 15 +- .../transport/pipes/PipeLiquidsStone.java | 15 +- .../transport/pipes/PipeLiquidsVoid.java | 15 +- .../transport/pipes/PipeLiquidsWood.java | 17 +- .../transport/pipes/PipePowerGold.java | 15 +- .../transport/pipes/PipePowerStone.java | 15 +- .../transport/pipes/PipePowerWood.java | 17 +- .../pipes/PipeStructureCobblestone.java | 15 +- .../transport/render/FacadeItemRenderer.java | 7 +- .../transport/render/PipeItemRenderer.java | 2 +- .../transport/render/PipeWorldRenderer.java | 35 ++-- .../transport/render/RenderPipe.java | 10 +- .../transport/utils/WireMatrix.java | 16 +- 62 files changed, 694 insertions(+), 535 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/items/{block_4_1.png => bluePipeWire.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_0_3.png => bucketFuel.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_1_4.png => diamondGearItem.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_1_3.png => goldGearItem.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_4_2.png => greenPipeWire.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_1_2.png => ironGearItem.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_4_0.png => redPipeWire.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_6_3.png => redstone_diamond_chipset.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_6_2.png => redstone_gold_chipset.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_6_1.png => redstone_iron_chipset.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_6_4.png => redstone_pulsating_chipset.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_6_0.png => redstone_red_chipset.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_1_1.png => stoneGearItem.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_1_0.png => woodenGearItem.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_0_2.png => wrenchItem.png} (100%) rename buildcraft_resources/mods/buildcraft/textures/items/{block_4_3.png => yellowPipeWire.png} (100%) create mode 100644 common/buildcraft/core/IIconProvider.java create mode 100644 common/buildcraft/transport/GateIconProvider.java delete mode 100644 common/buildcraft/transport/IconTerrainConstants.java create mode 100644 common/buildcraft/transport/PipeIconProvider.java create mode 100644 common/buildcraft/transport/WireIconProvider.java diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_1.png b/buildcraft_resources/mods/buildcraft/textures/items/bluePipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_4_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/bluePipeWire.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_3.png b/buildcraft_resources/mods/buildcraft/textures/items/bucketFuel.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_0_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/bucketFuel.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_4.png b/buildcraft_resources/mods/buildcraft/textures/items/diamondGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_1_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/diamondGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_3.png b/buildcraft_resources/mods/buildcraft/textures/items/goldGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_1_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/goldGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_2.png b/buildcraft_resources/mods/buildcraft/textures/items/greenPipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_4_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/greenPipeWire.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_2.png b/buildcraft_resources/mods/buildcraft/textures/items/ironGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_1_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/ironGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_0.png b/buildcraft_resources/mods/buildcraft/textures/items/redPipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_4_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/redPipeWire.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_3.png b/buildcraft_resources/mods/buildcraft/textures/items/redstone_diamond_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_6_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/redstone_diamond_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_2.png b/buildcraft_resources/mods/buildcraft/textures/items/redstone_gold_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_6_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/redstone_gold_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_1.png b/buildcraft_resources/mods/buildcraft/textures/items/redstone_iron_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_6_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/redstone_iron_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_4.png b/buildcraft_resources/mods/buildcraft/textures/items/redstone_pulsating_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_6_4.png rename to buildcraft_resources/mods/buildcraft/textures/items/redstone_pulsating_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_6_0.png b/buildcraft_resources/mods/buildcraft/textures/items/redstone_red_chipset.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_6_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/redstone_red_chipset.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_1.png b/buildcraft_resources/mods/buildcraft/textures/items/stoneGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_1_1.png rename to buildcraft_resources/mods/buildcraft/textures/items/stoneGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_1_0.png b/buildcraft_resources/mods/buildcraft/textures/items/woodenGearItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_1_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/woodenGearItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_0_2.png b/buildcraft_resources/mods/buildcraft/textures/items/wrenchItem.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_0_2.png rename to buildcraft_resources/mods/buildcraft/textures/items/wrenchItem.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_4_3.png b/buildcraft_resources/mods/buildcraft/textures/items/yellowPipeWire.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/block_4_3.png rename to buildcraft_resources/mods/buildcraft/textures/items/yellowPipeWire.png diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 8ee05171..605ac78c 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -28,17 +28,21 @@ import buildcraft.api.transport.IExtractionHandler; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.PipeManager; import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.core.ItemBuildCraft; import buildcraft.core.Version; import buildcraft.core.proxy.CoreProxy; import buildcraft.transport.BlockGenericPipe; +import buildcraft.transport.GateIconProvider; import buildcraft.transport.GuiHandler; import buildcraft.transport.ItemFacade; import buildcraft.transport.ItemGate; import buildcraft.transport.ItemPipe; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTriggerProvider; import buildcraft.transport.TransportProxy; +import buildcraft.transport.WireIconProvider; import buildcraft.transport.blueprints.BptBlockPipe; import buildcraft.transport.blueprints.BptItemPipeDiamond; import buildcraft.transport.blueprints.BptItemPipeEmerald; @@ -100,12 +104,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BuildCraftTransport { public static BlockGenericPipe genericPipeBlock; - @SideOnly(Side.CLIENT) - public Icon[] terrainIcons; - - @SideOnly(Side.CLIENT) - public Icon[] itemIcons; - public static boolean alwaysConnectPipes; public static boolean usePipeLoss; public static int maxItemsInPipes; @@ -170,6 +168,10 @@ public class BuildCraftTransport { @Instance("BuildCraft|Transport") public static BuildCraftTransport instance; + + public IIconProvider pipeIconProvider = new PipeIconProvider(); + public IIconProvider gateIconProvider = new GateIconProvider(); + public IIconProvider wireIconProvider = new WireIconProvider(); private static class PipeRecipe { boolean isShapeless = false; // pipe recipes come shaped and unshaped. @@ -260,8 +262,6 @@ public class BuildCraftTransport { groupItemsTrigger = groupItemsTriggerProp.getInt(); - TransportProxy.proxy.loadTerrainIcons(this); - TransportProxy.proxy.loadItemIcons(this); Property genericPipeId = BuildCraftCore.mainConfiguration.getBlock("pipe.id", DefaultProps.GENERIC_PIPE_ID); diff --git a/common/buildcraft/core/IIconProvider.java b/common/buildcraft/core/IIconProvider.java new file mode 100644 index 00000000..9f7a4195 --- /dev/null +++ b/common/buildcraft/core/IIconProvider.java @@ -0,0 +1,24 @@ +package buildcraft.core; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public interface IIconProvider { + + /** + * @param iconIndex + * @return + */ + @SideOnly(Side.CLIENT) + public Icon getIcon(int iconIndex); + + /** + * A call for the provider to register its Icons. This may be called multiple times but should only be executed once per provider + * @param iconRegister + */ + @SideOnly(Side.CLIENT) + public void RegisterIcons(IconRegister iconRegister); + +} diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index af559505..e04a63e1 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -9,12 +9,16 @@ package buildcraft.core; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import buildcraft.core.utils.StringUtil; public class ItemBuildCraft extends Item { + private String iconName; public ItemBuildCraft(int i) { super(i); setCreativeTab(CreativeTabBuildCraft.tabBuildCraft); @@ -24,4 +28,17 @@ public class ItemBuildCraft extends Item { public String getItemDisplayName(ItemStack itemstack) { return StringUtil.localize(getUnlocalizedName(itemstack)); } + + @Override + public Item setUnlocalizedName(String par1Str) { + iconName = par1Str; + return super.setUnlocalizedName(par1Str); + } + + @Override + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister par1IconRegister) + { + this.iconIndex = par1IconRegister.func_94245_a("buildcraft:" + iconName); + } } diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index 1f02a472..cad9f5ca 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -41,7 +41,7 @@ public class ItemRedstoneChipset extends ItemBuildCraft { } } - private static String[] chipsetNames = { "redstone_red", "redstone_iron", "redstone_gold", "redstone_gold", "redstone_diamond", "redstone_pulsating" }; + private static String[] chipsetNames = { "redstone_red", "redstone_iron", "redstone_gold", "redstone_diamond", "redstone_pulsating" }; @Override @SideOnly(Side.CLIENT) public void func_94581_a(IconRegister par1IconRegister) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 89ce45f4..4d80eb1d 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -701,6 +701,7 @@ public class BlockGenericPipe extends BlockContainer { } @SuppressWarnings({ "all" }) + @SideOnly(Side.CLIENT) public Icon getBlockTexture(IBlockAccess iblockaccess, int i, int j, int k, int l) { TileEntity tile = iblockaccess.getBlockTileEntity(i, j, k); @@ -793,13 +794,10 @@ public class BlockGenericPipe extends BlockContainer { pipes.put(item.itemID, clas); Pipe dummyPipe = createPipe(item.itemID); - if (dummyPipe != null && dummyPipe.getTextureIcons() != null) { - item.setPipeIcon(dummyPipe.getTextureIcons()[dummyPipe.getIconIndexForItem()]); - } else if (dummyPipe != null) { - BuildCraftCore.bcLog.info("The pipe "+ dummyPipe + " is not returning icons"); + if (dummyPipe != null) { + item.setPipeIconIndex(dummyPipe.getIconIndexForItem()); + TransportProxy.proxy.setIconProviderFromPipe(item, dummyPipe); } - - return item; } @@ -855,8 +853,15 @@ public class BlockGenericPipe extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void func_94332_a(IconRegister iconRegister) { - // NOOP we do this elsewhere + BuildCraftTransport.instance.gateIconProvider.RegisterIcons(iconRegister); + BuildCraftTransport.instance.wireIconProvider.RegisterIcons(iconRegister); + for (int i : pipes.keySet()){ + Pipe dummyPipe = createPipe(i); + if (dummyPipe != null){ + dummyPipe.getIconProvider().RegisterIcons(iconRegister); + } + } } } diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java new file mode 100644 index 00000000..605ab39f --- /dev/null +++ b/common/buildcraft/transport/GateIconProvider.java @@ -0,0 +1,90 @@ +package buildcraft.transport; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.core.IIconProvider; + +public class GateIconProvider implements IIconProvider { + + public static final int Gate_Dark = 0; + public static final int Gate_Lit = 1; + public static final int Gate_Iron_And_Dark = 2; + public static final int Gate_Iron_And_Lit = 3; + public static final int Gate_Iron_Or_Dark = 4; + public static final int Gate_Iron_Or_Lit = 5; + public static final int Gate_Gold_And_Dark = 6; + public static final int Gate_Gold_And_Lit = 7; + public static final int Gate_Gold_Or_Dark = 8; + public static final int Gate_Gold_Or_Lit = 9; + public static final int Gate_Diamond_And_Dark = 10; + public static final int Gate_Diamond_And_Lit = 11; + public static final int Gate_Diamond_Or_Dark = 12; + public static final int Gate_Diamond_Or_Lit = 13; + + public static final int Gate_Autarchic_Dark = 14; + public static final int Gate_Autarchic_Lit = 15; + public static final int Gate_Autarchic_Iron_And_Dark = 16; + public static final int Gate_Autarchic_Iron_And_Lit = 17; + public static final int Gate_Autarchic_Iron_Or_Dark = 18; + public static final int Gate_Autarchic_Iron_Or_Lit = 19; + public static final int Gate_Autarchic_Gold_And_Dark = 20; + public static final int Gate_Autarchic_Gold_And_Lit = 21; + public static final int Gate_Autarchic_Gold_Or_Dark = 22; + public static final int Gate_Autarchic_Gold_Or_Lit = 23; + public static final int Gate_Autarchic_Diamond_And_Dark = 24; + public static final int Gate_Autarchic_Diamond_And_Lit = 25; + public static final int Gate_Autarchic_Diamond_Or_Dark = 26; + public static final int Gate_Autarchic_Diamond_Or_Lit = 27; + + public static final int MAX = 28; + + @SideOnly(Side.CLIENT) + private Icon[] icons; + + private boolean registered = false; + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int pipeIconIndex) { + return icons[pipeIconIndex]; + } + + @Override + @SideOnly(Side.CLIENT) + public void RegisterIcons(IconRegister iconRegister) { + if (registered) return; + icons = new Icon[MAX]; + icons[GateIconProvider.Gate_Dark] = iconRegister.func_94245_a("buildcraft:gate_dark"); + icons[GateIconProvider.Gate_Lit] = iconRegister.func_94245_a("buildcraft:gate_lit"); + icons[GateIconProvider.Gate_Iron_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_iron_and_dark"); + icons[GateIconProvider.Gate_Iron_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_iron_and_lit"); + icons[GateIconProvider.Gate_Iron_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_iron_or_dark"); + icons[GateIconProvider.Gate_Iron_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_iron_or_lit"); + icons[GateIconProvider.Gate_Gold_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_gold_and_dark"); + icons[GateIconProvider.Gate_Gold_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_gold_and_lit"); + icons[GateIconProvider.Gate_Gold_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_gold_or_dark"); + icons[GateIconProvider.Gate_Gold_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_gold_or_lit"); + icons[GateIconProvider.Gate_Diamond_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_diamond_and_dark"); + icons[GateIconProvider.Gate_Diamond_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_diamond_and_lit"); + icons[GateIconProvider.Gate_Diamond_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_diamond_or_dark"); + icons[GateIconProvider.Gate_Diamond_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_diamond_or_lit"); + + icons[GateIconProvider.Gate_Autarchic_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_dark"); + icons[GateIconProvider.Gate_Autarchic_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_or_lit"); + } + +} diff --git a/common/buildcraft/transport/GateVanilla.java b/common/buildcraft/transport/GateVanilla.java index 253a4384..d45c7bac 100644 --- a/common/buildcraft/transport/GateVanilla.java +++ b/common/buildcraft/transport/GateVanilla.java @@ -262,24 +262,24 @@ public class GateVanilla extends Gate { if (!hasPulser()){ switch (kind){ case None: return 0; - case Single: return isGateActive ? IconTerrainConstants.Gate_Dark : IconTerrainConstants.Gate_Lit; - case AND_2: return isGateActive ? IconTerrainConstants.Gate_Iron_And_Dark : IconTerrainConstants.Gate_Iron_And_Lit; - case OR_2: return isGateActive ? IconTerrainConstants.Gate_Iron_Or_Dark : IconTerrainConstants.Gate_Iron_Or_Lit; - case AND_3: return isGateActive ? IconTerrainConstants.Gate_Gold_And_Dark : IconTerrainConstants.Gate_Gold_And_Lit; - case OR_3: return isGateActive ? IconTerrainConstants.Gate_Gold_Or_Dark : IconTerrainConstants.Gate_Gold_Or_Lit; - case AND_4: return isGateActive ? IconTerrainConstants.Gate_Diamond_And_Dark : IconTerrainConstants.Gate_Diamond_And_Lit; - case OR_4: return isGateActive ? IconTerrainConstants.Gate_Diamond_Or_Dark : IconTerrainConstants.Gate_Diamond_Or_Lit; + case Single: return isGateActive ? GateIconProvider.Gate_Dark : GateIconProvider.Gate_Lit; + case AND_2: return isGateActive ? GateIconProvider.Gate_Iron_And_Dark : GateIconProvider.Gate_Iron_And_Lit; + case OR_2: return isGateActive ? GateIconProvider.Gate_Iron_Or_Dark : GateIconProvider.Gate_Iron_Or_Lit; + case AND_3: return isGateActive ? GateIconProvider.Gate_Gold_And_Dark : GateIconProvider.Gate_Gold_And_Lit; + case OR_3: return isGateActive ? GateIconProvider.Gate_Gold_Or_Dark : GateIconProvider.Gate_Gold_Or_Lit; + case AND_4: return isGateActive ? GateIconProvider.Gate_Diamond_And_Dark : GateIconProvider.Gate_Diamond_And_Lit; + case OR_4: return isGateActive ? GateIconProvider.Gate_Diamond_Or_Dark : GateIconProvider.Gate_Diamond_Or_Lit; } } else { switch (kind){ case None: return 0; - case Single: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Dark : IconTerrainConstants.Gate_Autarchic_Lit; - case AND_2: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Iron_And_Dark : IconTerrainConstants.Gate_Autarchic_Iron_And_Lit; - case OR_2: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Iron_Or_Dark : IconTerrainConstants.Gate_Autarchic_Iron_Or_Lit; - case AND_3: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Gold_And_Dark : IconTerrainConstants.Gate_Autarchic_Gold_And_Lit; - case OR_3: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Gold_Or_Dark : IconTerrainConstants.Gate_Autarchic_Gold_Or_Lit; - case AND_4: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Diamond_And_Dark : IconTerrainConstants.Gate_Autarchic_Diamond_And_Lit; - case OR_4: return isGateActive ? IconTerrainConstants.Gate_Autarchic_Diamond_Or_Dark : IconTerrainConstants.Gate_Autarchic_Diamond_Or_Lit; + case Single: return isGateActive ? GateIconProvider.Gate_Autarchic_Dark : GateIconProvider.Gate_Autarchic_Lit; + case AND_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_And_Dark : GateIconProvider.Gate_Autarchic_Iron_And_Lit; + case OR_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_Or_Dark : GateIconProvider.Gate_Autarchic_Iron_Or_Lit; + case AND_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_And_Dark : GateIconProvider.Gate_Autarchic_Gold_And_Lit; + case OR_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_Or_Dark : GateIconProvider.Gate_Autarchic_Gold_Or_Lit; + case AND_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_And_Dark : GateIconProvider.Gate_Autarchic_Diamond_And_Lit; + case OR_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_Or_Dark : GateIconProvider.Gate_Autarchic_Diamond_Or_Lit; } } diff --git a/common/buildcraft/transport/IPipeRenderState.java b/common/buildcraft/transport/IPipeRenderState.java index 6cbf09fc..0141effa 100644 --- a/common/buildcraft/transport/IPipeRenderState.java +++ b/common/buildcraft/transport/IPipeRenderState.java @@ -1,8 +1,13 @@ package buildcraft.transport; +import buildcraft.core.IIconProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; public interface IPipeRenderState { public PipeRenderState getRenderState(); - public Icon[] getPipeIcons(); + + @SideOnly(Side.CLIENT) + public IIconProvider getPipeIcons(); } diff --git a/common/buildcraft/transport/IconItemConstants.java b/common/buildcraft/transport/IconItemConstants.java index 50cb8bf0..5f1baae7 100644 --- a/common/buildcraft/transport/IconItemConstants.java +++ b/common/buildcraft/transport/IconItemConstants.java @@ -2,21 +2,7 @@ package buildcraft.transport; public class IconItemConstants { - public static final int Gate = 0; - public static final int Gate_Iron_And = 1; - public static final int Gate_Iron_Or = 2; - public static final int Gate_Gold_And = 3; - public static final int Gate_Gold_Or = 4; - public static final int Gate_Diamond_And = 5; - public static final int Gate_Diamond_Or = 6; - public static final int Autarchic_Gate = 7; - public static final int Autarchic_Gate_Iron_And = 8; - public static final int Autarchic_Gate_Iron_Or = 9; - public static final int Autarchic_Gate_Gold_And = 10; - public static final int Autarchic_Gate_Gold_Or = 11; - public static final int Autarchic_Gate_Diamond_And = 12; - public static final int Autarchic_Gate_Diamond_Or = 13; public static final int Action_MachineControl_On = 14; diff --git a/common/buildcraft/transport/IconTerrainConstants.java b/common/buildcraft/transport/IconTerrainConstants.java deleted file mode 100644 index 27d9dec6..00000000 --- a/common/buildcraft/transport/IconTerrainConstants.java +++ /dev/null @@ -1,82 +0,0 @@ -package buildcraft.transport; - -public class IconTerrainConstants { - - public static final int PipeStructureCobblestone = 0; - public static final int PipeItemsCobbleStone = 1; - public static final int PipeItemsDiamond_Center = 2; - public static final int PipeItemsDiamond_Down = 3; - public static final int PipeItemsDiamond_Up = 4; - public static final int PipeItemsDiamond_North = 5; - public static final int PipeItemsDiamond_South = 6; - public static final int PipeItemsDiamond_West = 7; - public static final int PipeItemsDiamond_East = 8; - public static final int PipeItemsWood_Standard = 9; - public static final int PipeAllWood_Solid = 10; - public static final int PipeItemsEmerald_Standard = 11; - public static final int PipeAllEmerald_Solid = 12; - public static final int PipeItemsGold = 13; - public static final int PipeItemsIron_Standard = 14; - public static final int PipeAllIron_Solid = 15; - public static final int PipeItemsObsidian = 16; - public static final int PipeItemsSandstone = 17; - public static final int PipeItemsStone = 18; - public static final int PipeItemsVoid = 19; - public static final int PipeLiquidsCobblestone = 20; - public static final int PipeLiquidsWood_Standard = 21; - public static final int PipeLiquidsEmerald_Standard = 22; - public static final int PipeLiquidsGold = 23; - public static final int PipeLiquidsIron_Standard = 24; - public static final int PipeLiquidsSandstone = 25; - public static final int PipeLiquidsStone = 26; - public static final int PipeLiquidsVoid = 27; - public static final int PipePowerGold = 28; - public static final int PipePowerStone = 29; - public static final int PipePowerWood_Standard = 30; - - public static final int Texture_Red_Dark = 31; - public static final int Texture_Red_Lit = 32; - public static final int Texture_Blue_Dark = 33; - public static final int Texture_Blue_Lit = 34; - public static final int Texture_Green_Dark = 35; - public static final int Texture_Green_Lit = 36; - public static final int Texture_Yellow_Dark = 37; - public static final int Texture_Yellow_Lit = 38; - public static final int Texture_Cyan = 39; - - public static final int Gate_Dark = 40; - public static final int Gate_Lit = 41; - public static final int Gate_Iron_And_Dark = 42; - public static final int Gate_Iron_And_Lit = 43; - public static final int Gate_Iron_Or_Dark = 43; - public static final int Gate_Iron_Or_Lit = 44; - public static final int Gate_Gold_And_Dark = 45; - public static final int Gate_Gold_And_Lit = 46; - public static final int Gate_Gold_Or_Dark = 47; - public static final int Gate_Gold_Or_Lit = 48; - public static final int Gate_Diamond_And_Dark = 49; - public static final int Gate_Diamond_And_Lit = 50; - public static final int Gate_Diamond_Or_Dark = 51; - public static final int Gate_Diamond_Or_Lit = 52; - - public static final int Gate_Autarchic_Dark = 53; - public static final int Gate_Autarchic_Lit = 54; - public static final int Gate_Autarchic_Iron_And_Dark = 55; - public static final int Gate_Autarchic_Iron_And_Lit = 56; - public static final int Gate_Autarchic_Iron_Or_Dark = 57; - public static final int Gate_Autarchic_Iron_Or_Lit = 58; - public static final int Gate_Autarchic_Gold_And_Dark = 59; - public static final int Gate_Autarchic_Gold_And_Lit = 60; - public static final int Gate_Autarchic_Gold_Or_Dark = 61; - public static final int Gate_Autarchic_Gold_Or_Lit = 62; - public static final int Gate_Autarchic_Diamond_And_Dark = 63; - public static final int Gate_Autarchic_Diamond_And_Lit = 64; - public static final int Gate_Autarchic_Diamond_Or_Dark = 65; - public static final int Gate_Autarchic_Diamond_Or_Lit = 66; - - public static final int MAX = 67; - - - - -} diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 355abeac..f3a33b57 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -15,8 +15,29 @@ import buildcraft.core.ItemBuildCraft; public class ItemGate extends ItemBuildCraft { + public static final int Gate = 0; + public static final int Gate_Iron_And = 1; + public static final int Gate_Iron_Or = 2; + public static final int Gate_Gold_And = 3; + public static final int Gate_Gold_Or = 4; + public static final int Gate_Diamond_And = 5; + public static final int Gate_Diamond_Or = 6; + + public static final int Autarchic_Gate = 7; + public static final int Autarchic_Gate_Iron_And = 8; + public static final int Autarchic_Gate_Iron_Or = 9; + public static final int Autarchic_Gate_Gold_And = 10; + public static final int Autarchic_Gate_Gold_Or = 11; + public static final int Autarchic_Gate_Diamond_And = 12; + public static final int Autarchic_Gate_Diamond_Or = 13; + + public static final int MAX = 14; + private int series; + @SideOnly(Side.CLIENT) + private Icon[] icons; + public ItemGate(int i, int series) { super(i); @@ -41,36 +62,36 @@ public class ItemGate extends ItemBuildCraft { if (series == 0){ //Normal Gates switch (i) { case 0: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate]; + return icons[ItemGate.Gate]; case 1: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Iron_And]; + return icons[ItemGate.Gate_Iron_And]; case 2: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Iron_Or]; + return icons[ItemGate.Gate_Iron_Or]; case 3: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Gold_And]; + return icons[ItemGate.Gate_Gold_And]; case 4: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Gold_Or]; + return icons[ItemGate.Gate_Gold_Or]; case 5: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Diamond_And]; + return icons[ItemGate.Gate_Diamond_And]; default: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Gate_Diamond_Or]; + return icons[ItemGate.Gate_Diamond_Or]; } } else if (series == 1){ switch (i) { case 0: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate]; + return icons[ItemGate.Autarchic_Gate]; case 1: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_And]; + return icons[ItemGate.Autarchic_Gate_Iron_And]; case 2: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_Or]; + return icons[ItemGate.Autarchic_Gate_Iron_Or]; case 3: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_And]; + return icons[ItemGate.Autarchic_Gate_Gold_And]; case 4: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_Or]; + return icons[ItemGate.Autarchic_Gate_Gold_Or]; case 5: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_And]; + return icons[ItemGate.Autarchic_Gate_Diamond_And]; default: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_Or]; + return icons[ItemGate.Autarchic_Gate_Diamond_Or]; } } return null; @@ -96,8 +117,25 @@ public class ItemGate extends ItemBuildCraft { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void func_94581_a(IconRegister iconRegister) { - // NOOP + icons = new Icon[ItemGate.MAX]; + icons[ItemGate.Gate] = iconRegister.func_94245_a("buildcraft:gate"); + icons[ItemGate.Gate_Iron_And] = iconRegister.func_94245_a("buildcraft:gate_iron_and"); + icons[ItemGate.Gate_Iron_Or] = iconRegister.func_94245_a("buildcraft:gate_iron_or"); + icons[ItemGate.Gate_Gold_And] = iconRegister.func_94245_a("buildcraft:gate_gold_and"); + icons[ItemGate.Gate_Gold_Or] = iconRegister.func_94245_a("buildcraft:gate_gold_or"); + icons[ItemGate.Gate_Diamond_And] = iconRegister.func_94245_a("buildcraft:gate_diamond_and"); + icons[ItemGate.Gate_Diamond_Or] = iconRegister.func_94245_a("buildcraft:gate_diamond_or"); + + icons[ItemGate.Autarchic_Gate] = iconRegister.func_94245_a("buildcraft:autarchic_gate"); + icons[ItemGate.Autarchic_Gate_Iron_And] = iconRegister.func_94245_a("buildcraft:autarchic_gate_iron_and"); + icons[ItemGate.Autarchic_Gate_Iron_Or] = iconRegister.func_94245_a("buildcraft:autarchic_gate_iron_or"); + icons[ItemGate.Autarchic_Gate_Gold_And] = iconRegister.func_94245_a("buildcraft:autarchic_gate_gold_and"); + icons[ItemGate.Autarchic_Gate_Gold_Or] = iconRegister.func_94245_a("buildcraft:autarchic_gate_gold_or"); + icons[ItemGate.Autarchic_Gate_Diamond_And] = iconRegister.func_94245_a("buildcraft:autarchic_gate_diamond_and"); + icons[ItemGate.Autarchic_Gate_Diamond_Or] = iconRegister.func_94245_a("buildcraft:autarchic_gate_diamond_or"); + + } } diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index e8661462..904c6cd7 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -19,12 +19,18 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftTransport; import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.IIconProvider; import buildcraft.core.IItemPipe; import buildcraft.core.ItemBuildCraft; import buildcraft.BuildCraftCore; public class ItemPipe extends ItemBuildCraft implements IItemPipe { + @SideOnly(Side.CLIENT) + private IIconProvider iconProvider; + + private int pipeIconIndex; + protected ItemPipe(int i) { super(i); setCreativeTab(CreativeTabBuildCraft.tabBuildCraft); @@ -85,21 +91,32 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { } else return false; } - + @SideOnly(Side.CLIENT) - public Icon getPipeIcon(){ - return iconIndex; + public void setPipesIcons(IIconProvider iconProvider){ + this.iconProvider = iconProvider; } - + + public void setPipeIconIndex(int index){ + this.pipeIconIndex = index; + } + + @Override @SideOnly(Side.CLIENT) - public void setPipeIcon(Icon icon){ - this.iconIndex = icon; + public Icon getIconFromDamage(int par1) { + return iconProvider.getIcon(pipeIconIndex); } - + @Override @SideOnly(Side.CLIENT) public void func_94581_a(IconRegister par1IconRegister) { // NOOP } + + @Override + @SideOnly(Side.CLIENT) + public int func_94901_k() { + return 0; + } } diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 58ada53a..8b2f01a0 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -40,6 +40,7 @@ import buildcraft.api.gates.Trigger; import buildcraft.api.gates.TriggerParameter; import buildcraft.api.transport.IPipe; import buildcraft.core.IDropControlInventory; +import buildcraft.core.IIconProvider; import buildcraft.core.network.TilePacketWrapper; import buildcraft.core.triggers.ActionRedstoneOutput; import buildcraft.core.utils.Utils; @@ -143,7 +144,7 @@ public abstract class Pipe implements IPipe, IDropControlInventory { /** * Should return the textureindex used by the Pipe Item Renderer, as this is done client-side the default implementation might not work if your - * getTextureIndex(Orienations.Unknown) has logic + * getTextureIndex(Orienations.Unknown) has logic. Then override this * * @return */ @@ -151,13 +152,12 @@ public abstract class Pipe implements IPipe, IDropControlInventory { return getIconIndex(ForgeDirection.UNKNOWN); } - /** - * Should return an array of icons that is registered with this pipe. Do not return/modify the buildcraft one! + * Should return the IIconProvider that provides icons for this pipe * @return An array of icons */ @SideOnly(Side.CLIENT) - public abstract Icon[] getTextureIcons(); + public abstract IIconProvider getIconProvider(); /** * Should return the index in the array returned by GetTextureIcons() for a specified direction diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java new file mode 100644 index 00000000..3f1ab00c --- /dev/null +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -0,0 +1,111 @@ +package buildcraft.transport; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.core.IIconProvider; + +public class PipeIconProvider implements IIconProvider { + + public static final int PipeStructureCobblestone = 0; + public static final int PipeItemsCobbleStone = 1; + public static final int PipeItemsDiamond_Center = 2; + public static final int PipeItemsDiamond_Down = 3; + public static final int PipeItemsDiamond_Up = 4; + public static final int PipeItemsDiamond_North = 5; + public static final int PipeItemsDiamond_South = 6; + public static final int PipeItemsDiamond_West = 7; + public static final int PipeItemsDiamond_East = 8; + public static final int PipeItemsWood_Standard = 9; + public static final int PipeAllWood_Solid = 10; + public static final int PipeItemsEmerald_Standard = 11; + public static final int PipeAllEmerald_Solid = 12; + public static final int PipeItemsGold = 13; + public static final int PipeItemsIron_Standard = 14; + public static final int PipeAllIron_Solid = 15; + public static final int PipeItemsObsidian = 16; + public static final int PipeItemsSandstone = 17; + public static final int PipeItemsStone = 18; + public static final int PipeItemsVoid = 19; + public static final int PipeLiquidsCobblestone = 20; + public static final int PipeLiquidsWood_Standard = 21; + public static final int PipeLiquidsEmerald_Standard = 22; + public static final int PipeLiquidsGold = 23; + public static final int PipeLiquidsIron_Standard = 24; + public static final int PipeLiquidsSandstone = 25; + public static final int PipeLiquidsStone = 26; + public static final int PipeLiquidsVoid = 27; + public static final int PipePowerGold = 28; + public static final int PipePowerStone = 29; + public static final int PipePowerWood_Standard = 30; + + public static final int Power_Normal = 31; + public static final int Power_Overload = 32; + + public static final int MAX = 33; + + private boolean registered = false; + + @SideOnly(Side.CLIENT) + private Icon[] _icons; + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int pipeIconIndex) { + return _icons[pipeIconIndex]; + } + + @Override + @SideOnly(Side.CLIENT) + public void RegisterIcons(IconRegister iconRegister) { + if (registered) return; + + _icons = new Icon[PipeIconProvider.MAX]; + + _icons[PipeIconProvider.PipeStructureCobblestone] = iconRegister.func_94245_a("buildcraft:pipeStructureCobblestone"); + + _icons[PipeIconProvider.PipeItemsCobbleStone] = iconRegister.func_94245_a("buildcraft:pipeItemsCobblestone"); + + _icons[PipeIconProvider.PipeItemsDiamond_Center] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_center"); + _icons[PipeIconProvider.PipeItemsDiamond_Down] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_down"); + _icons[PipeIconProvider.PipeItemsDiamond_Up] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_up"); + _icons[PipeIconProvider.PipeItemsDiamond_North] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_north"); + _icons[PipeIconProvider.PipeItemsDiamond_South] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_south"); + _icons[PipeIconProvider.PipeItemsDiamond_West] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_west"); + _icons[PipeIconProvider.PipeItemsDiamond_East] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_east"); + + _icons[PipeIconProvider.PipeItemsWood_Standard] = iconRegister.func_94245_a("buildcraft:pipeItemsWood_standard"); + _icons[PipeIconProvider.PipeAllWood_Solid] = iconRegister.func_94245_a("buildcraft:pipeAllWood_solid"); + + _icons[PipeIconProvider.PipeItemsEmerald_Standard] = iconRegister.func_94245_a("buildcraft:pipeItemsEmerald_standard"); + _icons[PipeIconProvider.PipeAllEmerald_Solid] = iconRegister.func_94245_a("buildcraft:pipeAllEmerald_solid"); + + _icons[PipeIconProvider.PipeItemsGold] = iconRegister.func_94245_a("buildcraft:pipeItemsGold"); + + _icons[PipeIconProvider.PipeItemsIron_Standard] = iconRegister.func_94245_a("buildcraft:pipeItemsIron_standard"); + _icons[PipeIconProvider.PipeAllIron_Solid] = iconRegister.func_94245_a("buildcraft:pipeAllIron_solid"); + + _icons[PipeIconProvider.PipeItemsObsidian] = iconRegister.func_94245_a("buildcraft:pipeItemsObsidian"); + _icons[PipeIconProvider.PipeItemsSandstone] = iconRegister.func_94245_a("buildcraft:pipeItemsSandstone"); + _icons[PipeIconProvider.PipeItemsStone] = iconRegister.func_94245_a("buildcraft:pipeItemsStone"); + _icons[PipeIconProvider.PipeItemsVoid] = iconRegister.func_94245_a("buildcraft:pipeItemsVoid"); + + _icons[PipeIconProvider.PipeLiquidsCobblestone] = iconRegister.func_94245_a("buildcraft:pipeLiquidsCobblestone"); + _icons[PipeIconProvider.PipeLiquidsWood_Standard] = iconRegister.func_94245_a("buildcraft:pipeLiquidsWood_standard"); + _icons[PipeIconProvider.PipeLiquidsEmerald_Standard] = iconRegister.func_94245_a("buildcraft:pipeLiquidsEmerald_standard"); + _icons[PipeIconProvider.PipeLiquidsGold] = iconRegister.func_94245_a("buildcraft:pipeLiquidsGold"); + _icons[PipeIconProvider.PipeLiquidsIron_Standard] = iconRegister.func_94245_a("buildcraft:pipeLiquidsIron_standard"); + _icons[PipeIconProvider.PipeLiquidsSandstone] = iconRegister.func_94245_a("buildcraft:pipeLiquidsSandstone"); + _icons[PipeIconProvider.PipeLiquidsStone] = iconRegister.func_94245_a("buildcraft:pipeLiquidsStone"); + _icons[PipeIconProvider.PipeLiquidsVoid] = iconRegister.func_94245_a("buildcraft:pipeLiquidsVoid"); + + _icons[PipeIconProvider.PipePowerGold] = iconRegister.func_94245_a("buildcraft:pipePowerGold"); + _icons[PipeIconProvider.PipePowerStone] = iconRegister.func_94245_a("buildcraft:pipePowerStone"); + _icons[PipeIconProvider.PipePowerWood_Standard] = iconRegister.func_94245_a("buildcraft:pipePowerWood_standard"); + + _icons[PipeIconProvider.Power_Normal] = iconRegister.func_94245_a("buildcraft:texture_cyan"); + _icons[PipeIconProvider.Power_Overload] = iconRegister.func_94245_a("buildcraft:texture_red_dark"); + } + +} diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index ca79c59e..9d83e485 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -4,6 +4,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.util.Icon; import buildcraft.core.DefaultProps; @@ -29,6 +32,7 @@ public class PipeRenderState implements IClientState { /* * This is a placeholder for the pipe renderer to set to a value that the BlockGenericPipe->TileGenericPipe will then return the the WorldRenderer */ + @SideOnly(Side.CLIENT) public Icon currentTexture; public void setHasGate(boolean value) { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 40ac1c0c..27249f9f 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -45,6 +45,7 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; import buildcraft.core.IDropControlInventory; +import buildcraft.core.IIconProvider; import buildcraft.core.ITileBufferHolder; import buildcraft.core.TileBuffer; import buildcraft.core.network.IClientState; @@ -214,7 +215,25 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { renderState.wireMatrix.setWireConnected(color, direction, pipe.isWireConnectedTo(this.getTile(direction), color)); } - renderState.wireMatrix.setWireLit(color, pipe.signalStrength[color.ordinal()] > 0); + boolean lit = pipe.signalStrength[color.ordinal()] > 0; + + switch(color){ + case Red: + renderState.wireMatrix.setWireIndex(color, lit? WireIconProvider.Texture_Red_Lit : WireIconProvider.Texture_Red_Dark); + break; + case Blue: + renderState.wireMatrix.setWireIndex(color, lit? WireIconProvider.Texture_Blue_Lit : WireIconProvider.Texture_Blue_Dark); + break; + case Green: + renderState.wireMatrix.setWireIndex(color, lit? WireIconProvider.Texture_Green_Lit : WireIconProvider.Texture_Green_Dark); + break; + case Yellow: + renderState.wireMatrix.setWireIndex(color, lit? WireIconProvider.Texture_Yellow_Lit : WireIconProvider.Texture_Yellow_Dark); + break; + default: + break; + + } } // Gate Textures @@ -586,9 +605,10 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank } @Override - public Icon[] getPipeIcons() { + @SideOnly(Side.CLIENT) + public IIconProvider getPipeIcons() { if (pipe == null) return null; - return pipe.getTextureIcons(); + return pipe.getIconProvider(); } @Override diff --git a/common/buildcraft/transport/TransportProxy.java b/common/buildcraft/transport/TransportProxy.java index a601f578..08e329d1 100644 --- a/common/buildcraft/transport/TransportProxy.java +++ b/common/buildcraft/transport/TransportProxy.java @@ -18,10 +18,11 @@ public class TransportProxy { public void registerRenderers() { } - public void loadTerrainIcons(BuildCraftTransport instance) { + public void initIconProviders(BuildCraftTransport instance){ + } - - public void loadItemIcons(BuildCraftTransport instance){ + + public void setIconProviderFromPipe(ItemPipe item, Pipe dummyPipe) { } diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index ad9520d1..bdf6378d 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -62,145 +62,48 @@ public class TransportProxyClient extends TransportProxy { } @Override - public void loadTerrainIcons(BuildCraftTransport instance) { - instance.terrainIcons = new Icon[IconTerrainConstants.MAX]; - TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.field_94154_l; - - instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeStructureCobblestone"); - - instance.terrainIcons[IconTerrainConstants.PipeItemsCobbleStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsCobblestone"); - - instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Center] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_center"); - instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Down] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_down"); - instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_Up] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_up"); - instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_North] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_north"); - instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_South] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_south"); - instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_West] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_west"); - instance.terrainIcons[IconTerrainConstants.PipeItemsDiamond_East] = terrainTextures.func_94245_a("buildcraft:pipeItemsDiamond_east"); - - instance.terrainIcons[IconTerrainConstants.PipeItemsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsWood_standard"); - instance.terrainIcons[IconTerrainConstants.PipeAllWood_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllWood_solid"); - - instance.terrainIcons[IconTerrainConstants.PipeItemsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsEmerald_standard"); - instance.terrainIcons[IconTerrainConstants.PipeAllEmerald_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllEmerald_solid"); - - instance.terrainIcons[IconTerrainConstants.PipeItemsGold] = terrainTextures.func_94245_a("buildcraft:pipeItemsGold"); - - instance.terrainIcons[IconTerrainConstants.PipeItemsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeItemsIron_standard"); - instance.terrainIcons[IconTerrainConstants.PipeAllIron_Solid] = terrainTextures.func_94245_a("buildcraft:pipeAllIron_solid"); - - instance.terrainIcons[IconTerrainConstants.PipeItemsObsidian] = terrainTextures.func_94245_a("buildcraft:pipeItemsObsidian"); - instance.terrainIcons[IconTerrainConstants.PipeItemsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeItemsSandstone"); - instance.terrainIcons[IconTerrainConstants.PipeItemsStone] = terrainTextures.func_94245_a("buildcraft:pipeItemsStone"); - instance.terrainIcons[IconTerrainConstants.PipeItemsVoid] = terrainTextures.func_94245_a("buildcraft:pipeItemsVoid"); - - instance.terrainIcons[IconTerrainConstants.PipeLiquidsCobblestone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsCobblestone"); - instance.terrainIcons[IconTerrainConstants.PipeLiquidsWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsWood_standard"); - instance.terrainIcons[IconTerrainConstants.PipeLiquidsEmerald_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsEmerald_standard"); - instance.terrainIcons[IconTerrainConstants.PipeLiquidsGold] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsGold"); - instance.terrainIcons[IconTerrainConstants.PipeLiquidsIron_Standard] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsIron_standard"); - instance.terrainIcons[IconTerrainConstants.PipeLiquidsSandstone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsSandstone"); - instance.terrainIcons[IconTerrainConstants.PipeLiquidsStone] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsStone"); - instance.terrainIcons[IconTerrainConstants.PipeLiquidsVoid] = terrainTextures.func_94245_a("buildcraft:pipeLiquidsVoid"); - - instance.terrainIcons[IconTerrainConstants.PipePowerGold] = terrainTextures.func_94245_a("buildcraft:pipePowerGold"); - instance.terrainIcons[IconTerrainConstants.PipePowerStone] = terrainTextures.func_94245_a("buildcraft:pipePowerStone"); - instance.terrainIcons[IconTerrainConstants.PipePowerWood_Standard] = terrainTextures.func_94245_a("buildcraft:pipePowerWood_standard"); - - instance.terrainIcons[IconTerrainConstants.Texture_Red_Dark] = terrainTextures.func_94245_a("buildcraft:texture_red_dark"); - instance.terrainIcons[IconTerrainConstants.Texture_Red_Lit] = terrainTextures.func_94245_a("buildcraft:texture_red_lit"); - instance.terrainIcons[IconTerrainConstants.Texture_Blue_Dark] = terrainTextures.func_94245_a("buildcraft:texture_blue_dark"); - instance.terrainIcons[IconTerrainConstants.Texture_Blue_Lit] = terrainTextures.func_94245_a("buildcraft:texture_blue_lit"); - instance.terrainIcons[IconTerrainConstants.Texture_Green_Dark] = terrainTextures.func_94245_a("buildcraft:texture_green_dark"); - instance.terrainIcons[IconTerrainConstants.Texture_Green_Lit] = terrainTextures.func_94245_a("buildcraft:texture_green_lit"); - instance.terrainIcons[IconTerrainConstants.Texture_Yellow_Dark] = terrainTextures.func_94245_a("buildcraft:texture_yellow_dark"); - instance.terrainIcons[IconTerrainConstants.Texture_Yellow_Lit] = terrainTextures.func_94245_a("buildcraft:texture_yellow_lit"); - instance.terrainIcons[IconTerrainConstants.Texture_Cyan] = terrainTextures.func_94245_a("buildcraft:texture_cyan"); - - instance.terrainIcons[IconTerrainConstants.Gate_Dark] = terrainTextures.func_94245_a("buildcraft:gate_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Lit] = terrainTextures.func_94245_a("buildcraft:gate_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Iron_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_iron_and_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Iron_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_iron_and_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Iron_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_iron_or_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Iron_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_iron_or_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Gold_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_gold_and_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Gold_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_gold_and_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Gold_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_gold_or_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Gold_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_gold_or_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Diamond_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_diamond_and_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Diamond_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_diamond_and_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Diamond_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_diamond_or_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Diamond_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_diamond_or_lit"); - - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_and_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_and_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_or_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Iron_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_iron_or_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_and_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_and_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_or_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Gold_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_gold_or_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_And_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_and_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_And_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_and_lit"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_Or_Dark] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_or_dark"); - instance.terrainIcons[IconTerrainConstants.Gate_Autarchic_Diamond_Or_Lit] = terrainTextures.func_94245_a("buildcraft:gate_autarchic_diamond_or_lit"); - } - - @Override - public void loadItemIcons(BuildCraftTransport instance) { - instance.itemIcons = new Icon[IconItemConstants.MAX]; - TextureMap itemTextures = Minecraft.getMinecraft().renderEngine.field_94155_m; - - instance.itemIcons[IconItemConstants.Gate] = itemTextures.func_94245_a("buildcraft:gate"); - instance.itemIcons[IconItemConstants.Gate_Iron_And] = itemTextures.func_94245_a("buildcraft:gate_iron_and"); - instance.itemIcons[IconItemConstants.Gate_Iron_Or] = itemTextures.func_94245_a("buildcraft:gate_iron_or"); - instance.itemIcons[IconItemConstants.Gate_Gold_And] = itemTextures.func_94245_a("buildcraft:gate_gold_and"); - instance.itemIcons[IconItemConstants.Gate_Gold_Or] = itemTextures.func_94245_a("buildcraft:gate_gold_or"); - instance.itemIcons[IconItemConstants.Gate_Diamond_And] = itemTextures.func_94245_a("buildcraft:gate_diamond_and"); - instance.itemIcons[IconItemConstants.Gate_Diamond_Or] = itemTextures.func_94245_a("buildcraft:gate_diamond_or"); - - instance.itemIcons[IconItemConstants.Autarchic_Gate] = itemTextures.func_94245_a("buildcraft:autarchic_gate"); - instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_iron_and"); - instance.itemIcons[IconItemConstants.Autarchic_Gate_Iron_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_iron_or"); - instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_gold_and"); - instance.itemIcons[IconItemConstants.Autarchic_Gate_Gold_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_gold_or"); - instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_And] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_and"); - instance.itemIcons[IconItemConstants.Autarchic_Gate_Diamond_Or] = itemTextures.func_94245_a("buildcraft:autarchic_gate_diamond_or"); - - instance.itemIcons[IconItemConstants.Action_MachineControl_On] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_on"); - instance.itemIcons[IconItemConstants.Action_MachineControl_Off] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_off"); - instance.itemIcons[IconItemConstants.Action_MachineControl_Loop] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_loop"); - - instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Blue] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_blue"); - instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Green] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_green"); - instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Yellow] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_yellow"); - instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Red] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_red"); - instance.itemIcons[IconItemConstants.Trigger_Inventory_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_empty"); - instance.itemIcons[IconItemConstants.Trigger_Inventory_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_contains"); - instance.itemIcons[IconItemConstants.Trigger_Inventory_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_space"); - instance.itemIcons[IconItemConstants.Trigger_Inventory_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_full"); - instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_empty"); - instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_contains"); - instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_space"); - instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_full"); - instance.itemIcons[IconItemConstants.Trigger_Machine_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_active"); - instance.itemIcons[IconItemConstants.Trigger_Machine_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_inactive"); - instance.itemIcons[IconItemConstants.Trigger_PipeContents_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_empty"); - instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsItems] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsitems"); - instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsLiquid] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsliquid"); - instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsEnergy] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsenergy"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_active"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_inactive"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_active"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_inactive"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_active"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_inactive"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_active"); - instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); - instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_active"); - instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_inactive"); - + public void setIconProviderFromPipe(ItemPipe item, Pipe dummyPipe) { + item.setPipesIcons(dummyPipe.getIconProvider()); } + +// +// @Override +// public void loadItemIcons(BuildCraftTransport instance) { +// TextureMap itemTextures = Minecraft.getMinecraft().renderEngine.field_94155_m; +// +// +// instance.itemIcons[IconItemConstants.Action_MachineControl_On] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_on"); +// instance.itemIcons[IconItemConstants.Action_MachineControl_Off] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_off"); +// instance.itemIcons[IconItemConstants.Action_MachineControl_Loop] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_loop"); +// +// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Blue] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_blue"); +// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Green] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_green"); +// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Yellow] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_yellow"); +// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Red] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_red"); +// instance.itemIcons[IconItemConstants.Trigger_Inventory_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_empty"); +// instance.itemIcons[IconItemConstants.Trigger_Inventory_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_contains"); +// instance.itemIcons[IconItemConstants.Trigger_Inventory_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_space"); +// instance.itemIcons[IconItemConstants.Trigger_Inventory_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_full"); +// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_empty"); +// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_contains"); +// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_space"); +// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_full"); +// instance.itemIcons[IconItemConstants.Trigger_Machine_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_active"); +// instance.itemIcons[IconItemConstants.Trigger_Machine_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_inactive"); +// instance.itemIcons[IconItemConstants.Trigger_PipeContents_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_empty"); +// instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsItems] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsitems"); +// instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsLiquid] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsliquid"); +// instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsEnergy] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsenergy"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_active"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_inactive"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_active"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_inactive"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_active"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_inactive"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_active"); +// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); +// instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_active"); +// instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_inactive"); +// +// } } diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java new file mode 100644 index 00000000..cb5eb191 --- /dev/null +++ b/common/buildcraft/transport/WireIconProvider.java @@ -0,0 +1,50 @@ +package buildcraft.transport; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.core.IIconProvider; + +public class WireIconProvider implements IIconProvider { + + public static final int Texture_Red_Dark = 0; + public static final int Texture_Red_Lit = 1; + public static final int Texture_Blue_Dark = 2; + public static final int Texture_Blue_Lit = 3; + public static final int Texture_Green_Dark = 4; + public static final int Texture_Green_Lit = 5; + public static final int Texture_Yellow_Dark = 6; + public static final int Texture_Yellow_Lit = 7; + + public static final int MAX = 8; + + @SideOnly(Side.CLIENT) + private Icon[] icons; + + private boolean registered = false; + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int pipeIconIndex) { + return icons[pipeIconIndex]; + } + + @Override + @SideOnly(Side.CLIENT) + public void RegisterIcons(IconRegister iconRegister) { + if (registered) return; + icons = new Icon[MAX]; + + icons[WireIconProvider.Texture_Red_Dark] = iconRegister.func_94245_a("buildcraft:texture_red_dark"); + icons[WireIconProvider.Texture_Red_Lit] = iconRegister.func_94245_a("buildcraft:texture_red_lit"); + icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.func_94245_a("buildcraft:texture_blue_dark"); + icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.func_94245_a("buildcraft:texture_blue_lit"); + icons[WireIconProvider.Texture_Green_Dark] = iconRegister.func_94245_a("buildcraft:texture_green_dark"); + icons[WireIconProvider.Texture_Green_Lit] = iconRegister.func_94245_a("buildcraft:texture_green_lit"); + icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.func_94245_a("buildcraft:texture_yellow_dark"); + icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.func_94245_a("buildcraft:texture_yellow_lit"); + + } + +} diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index 9054f3c8..961f293f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -8,15 +8,14 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsCobblestone extends Pipe { @@ -27,13 +26,13 @@ public class PipeItemsCobblestone extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeItemsCobbleStone; + return PipeIconProvider.PipeItemsCobbleStone; } } diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index 547d4382..25064219 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -13,24 +13,22 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.LinkedList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.core.network.IClientState; import buildcraft.transport.IPipeTransportItemsHook; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsDiamond extends Pipe implements IPipeTransportItemsHook, IClientState { @@ -40,20 +38,20 @@ public class PipeItemsDiamond extends Pipe implements IPipeTransportItemsHook, I @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { switch(direction){ - case UNKNOWN: return IconTerrainConstants.PipeItemsDiamond_Center; - case DOWN: return IconTerrainConstants.PipeItemsDiamond_Down; - case UP: return IconTerrainConstants.PipeItemsDiamond_Up; - case NORTH: return IconTerrainConstants.PipeItemsDiamond_North; - case SOUTH: return IconTerrainConstants.PipeItemsDiamond_South; - case WEST: return IconTerrainConstants.PipeItemsDiamond_West; - case EAST: return IconTerrainConstants.PipeItemsDiamond_East; + case UNKNOWN: return PipeIconProvider.PipeItemsDiamond_Center; + case DOWN: return PipeIconProvider.PipeItemsDiamond_Down; + case UP: return PipeIconProvider.PipeItemsDiamond_Up; + case NORTH: return PipeIconProvider.PipeItemsDiamond_North; + case SOUTH: return PipeIconProvider.PipeItemsDiamond_South; + case WEST: return PipeIconProvider.PipeItemsDiamond_West; + case EAST: return PipeIconProvider.PipeItemsDiamond_East; default: throw new IllegalArgumentException("direction out of bounds"); } } diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index 6769cda8..960f792d 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -8,13 +8,21 @@ */ package buildcraft.transport.pipes; -import buildcraft.BuildCraftTransport; -import buildcraft.api.inventory.ISelectiveInventory; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; +import buildcraft.BuildCraftTransport; +import buildcraft.api.inventory.ISelectiveInventory; import buildcraft.api.inventory.ISpecialInventory; import buildcraft.core.GuiIds; import buildcraft.core.network.IClientState; @@ -22,15 +30,8 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.SimpleInventory; import buildcraft.core.utils.Utils; import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory, IClientState { @@ -40,8 +41,8 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory protected PipeItemsEmerald(int itemID, PipeTransportItems transport) { super(transport, new PipeLogicEmerald(), itemID); - standardIconIndex = IconTerrainConstants.PipeItemsEmerald_Standard; - solidIconIndex = IconTerrainConstants.PipeAllEmerald_Solid; + standardIconIndex = PipeIconProvider.PipeItemsEmerald_Standard; + solidIconIndex = PipeIconProvider.PipeAllEmerald_Solid; } public PipeItemsEmerald(int itemID) { diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index d0db38da..c3745db1 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -10,20 +10,18 @@ package buildcraft.transport.pipes; import java.util.LinkedList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsGold extends Pipe implements IPipeTransportItemsHook { @@ -33,13 +31,13 @@ public class PipeItemsGold extends Pipe implements IPipeTransportItemsHook { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeItemsGold; + return PipeIconProvider.PipeItemsGold; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index f5939690..2ac44b3e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -8,20 +8,19 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsIron extends Pipe { - private int standardIconIndex = IconTerrainConstants.PipeItemsIron_Standard; - private int solidIconIndex = IconTerrainConstants.PipeAllIron_Solid; + private int standardIconIndex = PipeIconProvider.PipeItemsIron_Standard; + private int solidIconIndex = PipeIconProvider.PipeAllIron_Solid; public PipeItemsIron(int itemID) { super(new PipeTransportItems(), new PipeLogicIron(), itemID); @@ -29,12 +28,6 @@ public class PipeItemsIron extends Pipe { ((PipeTransportItems) transport).allowBouncing = true; } - @Override - @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; - } - @Override public int getIconIndex(ForgeDirection direction) { if (direction == ForgeDirection.UNKNOWN) @@ -49,6 +42,12 @@ public class PipeItemsIron extends Pipe { } } + @Override + @SideOnly(Side.CLIENT) + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; + } + @Override public boolean canConnectRedstone() { return true; diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index 7877281e..486d8e3e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -10,19 +10,14 @@ package buildcraft.transport.pipes; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.item.EntityMinecartChest; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; @@ -30,13 +25,15 @@ import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; +import buildcraft.core.IIconProvider; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsObsidian extends Pipe implements IPowerReceptor { @@ -61,13 +58,13 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } - + @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeItemsObsidian; + return PipeIconProvider.PipeItemsObsidian; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index b351f4f4..8e9cb18e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -9,15 +9,14 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsSandstone extends Pipe { public PipeItemsSandstone(int itemID) { @@ -26,12 +25,12 @@ public class PipeItemsSandstone extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeItemsSandstone; + return PipeIconProvider.PipeItemsSandstone; } } diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index ac40cacd..699f476a 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -10,20 +10,18 @@ package buildcraft.transport.pipes; import java.util.LinkedList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsStone extends Pipe implements IPipeTransportItemsHook { @@ -34,13 +32,13 @@ public class PipeItemsStone extends Pipe implements IPipeTransportItemsHook { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeItemsStone; + return PipeIconProvider.PipeItemsStone; } @Override diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index 8a4e4970..40a601fd 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -9,18 +9,17 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.transport.EntityData; import buildcraft.transport.IItemTravelingHook; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsVoid extends Pipe implements IItemTravelingHook { @@ -31,13 +30,13 @@ public class PipeItemsVoid extends Pipe implements IItemTravelingHook { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeItemsVoid; + return PipeIconProvider.PipeItemsVoid; } // This is called if the void pipe is only connected to one pipe diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index ed9a6093..df3198fa 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -8,12 +8,9 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; @@ -25,20 +22,22 @@ import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.api.transport.IPipedItem; import buildcraft.api.transport.PipeManager; -import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; +import buildcraft.core.IIconProvider; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeItemsWood extends Pipe implements IPowerReceptor { private IPowerProvider powerProvider; - protected int standardIconIndex = IconTerrainConstants.PipeItemsWood_Standard; - protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid; + protected int standardIconIndex = PipeIconProvider.PipeItemsWood_Standard; + protected int solidIconIndex = PipeIconProvider.PipeAllWood_Solid; protected PipeItemsWood(PipeTransportItems transport, PipeLogic logic, int itemID) { super(transport, logic, itemID); @@ -58,8 +57,8 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java index fb8e599a..f8aba53e 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java @@ -8,15 +8,14 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeLiquidsCobblestone extends Pipe { @@ -26,12 +25,12 @@ public class PipeLiquidsCobblestone extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeLiquidsCobblestone; + return PipeIconProvider.PipeLiquidsCobblestone; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java index 239667af..6b8e1726 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java @@ -8,7 +8,7 @@ */ package buildcraft.transport.pipes; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; /** @@ -20,8 +20,8 @@ public class PipeLiquidsEmerald extends PipeLiquidsWood { public PipeLiquidsEmerald(int itemID) { super(new PipeLogicEmerald(), itemID); - standardIconIndex = IconTerrainConstants.PipeLiquidsEmerald_Standard; - solidIconIndex = IconTerrainConstants.PipeAllEmerald_Solid; + standardIconIndex = PipeIconProvider.PipeLiquidsEmerald_Standard; + solidIconIndex = PipeIconProvider.PipeAllEmerald_Solid; ((PipeTransportLiquids) transport).flowRate = 40; ((PipeTransportLiquids) transport).travelDelay = 4; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsGold.java b/common/buildcraft/transport/pipes/PipeLiquidsGold.java index 684c421b..614b5420 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsGold.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsGold.java @@ -8,15 +8,14 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeLiquidsGold extends Pipe { @@ -29,13 +28,13 @@ public class PipeLiquidsGold extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeLiquidsGold; + return PipeIconProvider.PipeLiquidsGold; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsIron.java b/common/buildcraft/transport/pipes/PipeLiquidsIron.java index 83e86ffb..1b615307 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsIron.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsIron.java @@ -8,20 +8,19 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeLiquidsIron extends Pipe { - protected int standardIconIndex = IconTerrainConstants.PipeLiquidsIron_Standard; - protected int solidIconIndex = IconTerrainConstants.PipeAllIron_Solid; + protected int standardIconIndex = PipeIconProvider.PipeLiquidsIron_Standard; + protected int solidIconIndex = PipeIconProvider.PipeAllIron_Solid; public PipeLiquidsIron(int itemID) { @@ -30,8 +29,8 @@ public class PipeLiquidsIron extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java index 9999663e..00a47c0a 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -9,18 +9,17 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.transport.IPipeTransportLiquidsHook; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.TileGenericPipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeLiquidsSandstone extends Pipe implements IPipeTransportLiquidsHook { public PipeLiquidsSandstone(int itemID) { @@ -29,13 +28,13 @@ public class PipeLiquidsSandstone extends Pipe implements IPipeTransportLiquidsH @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeLiquidsSandstone; + return PipeIconProvider.PipeLiquidsSandstone; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsStone.java b/common/buildcraft/transport/pipes/PipeLiquidsStone.java index 9c884fe3..8e1420b5 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsStone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsStone.java @@ -8,15 +8,14 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeLiquidsStone extends Pipe { @@ -28,13 +27,13 @@ public class PipeLiquidsStone extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeLiquidsStone; + return PipeIconProvider.PipeLiquidsStone; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java index ff0ca3ca..6a191027 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java @@ -9,17 +9,16 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.transport.IPipeTransportLiquidsHook; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeLiquidsVoid extends Pipe implements IPipeTransportLiquidsHook { @@ -29,13 +28,13 @@ public class PipeLiquidsVoid extends Pipe implements IPipeTransportLiquidsHook { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeLiquidsVoid; + return PipeIconProvider.PipeLiquidsVoid; } @Override diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index 749892e0..d2193dda 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -8,10 +8,7 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ITankContainer; @@ -23,12 +20,14 @@ import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.api.transport.PipeManager; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.network.TileNetworkData; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeLiquidsWood extends Pipe implements IPowerReceptor { @@ -37,8 +36,8 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { private IPowerProvider powerProvider; - protected int standardIconIndex = IconTerrainConstants.PipeLiquidsWood_Standard; - protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid; + protected int standardIconIndex = PipeIconProvider.PipeLiquidsWood_Standard; + protected int solidIconIndex = PipeIconProvider.PipeAllWood_Solid; long lastMining = 0; boolean lastPower = false; @@ -127,8 +126,8 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index da89707f..0e0b9d55 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -8,15 +8,14 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipePowerGold extends Pipe { @@ -28,13 +27,13 @@ public class PipePowerGold extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipePowerGold; + return PipeIconProvider.PipePowerGold; } } diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index 6c397c30..8b6c91f0 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -8,15 +8,14 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipePowerStone extends Pipe { @@ -26,13 +25,13 @@ public class PipePowerStone extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipePowerStone; + return PipeIconProvider.PipePowerStone; } } diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index f9b96654..010742a0 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -8,21 +8,20 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; import buildcraft.transport.TileGenericPipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipePowerWood extends Pipe implements IPowerReceptor { @@ -30,8 +29,8 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { private IPowerProvider powerProvider; - protected int standardIconIndex = IconTerrainConstants.PipePowerWood_Standard; - protected int solidIconIndex = IconTerrainConstants.PipeAllWood_Solid; + protected int standardIconIndex = PipeIconProvider.PipePowerWood_Standard; + protected int solidIconIndex = PipeIconProvider.PipeAllWood_Solid; private int overheatTicks; @@ -46,8 +45,8 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index 8746493c..0808df28 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -1,14 +1,13 @@ package buildcraft.transport.pipes; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.core.IIconProvider; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportStructure; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeStructureCobblestone extends Pipe { @@ -18,12 +17,12 @@ public class PipeStructureCobblestone extends Pipe { @Override @SideOnly(Side.CLIENT) - public Icon[] getTextureIcons() { - return BuildCraftTransport.instance.terrainIcons; + public IIconProvider getIconProvider() { + return BuildCraftTransport.instance.pipeIconProvider; } @Override public int getIconIndex(ForgeDirection direction) { - return IconTerrainConstants.PipeStructureCobblestone; + return PipeIconProvider.PipeStructureCobblestone; } } diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index d16fed0a..2dc11617 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -5,17 +5,14 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.ItemFacade; -import buildcraft.transport.pipes.PipeStructureCobblestone; +import buildcraft.transport.PipeIconProvider; public class FacadeItemRenderer implements IItemRenderer { @@ -65,7 +62,7 @@ public class FacadeItemRenderer implements IItemRenderer { // Render StructurePipe block = BuildCraftTransport.genericPipeBlock; - Icon textureID = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone]; // Structure pipe + Icon textureID = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.PipeStructureCobblestone); // Structure pipe block.setBlockBounds(Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos - 1F / 16F); block.setBlockBoundsForItemRender(); diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index b1aaf503..29544dd0 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -22,7 +22,7 @@ public class PipeItemRenderer implements IItemRenderer { Tessellator tessellator = Tessellator.instance; Block block = BuildCraftTransport.genericPipeBlock; - Icon icon = ((ItemPipe) Item.itemsList[item.itemID]).getPipeIcon(); + Icon icon = ((ItemPipe) Item.itemsList[item.itemID]).getIconFromDamage(0); block.setBlockBounds(Utils.pipeMinPos, 0.0F, Utils.pipeMinPos, Utils.pipeMaxPos, 1.0F, Utils.pipeMaxPos); block.setBlockBoundsForItemRender(); diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 9f8c10ce..4361c90e 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -3,19 +3,17 @@ package buildcraft.transport.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe.WireColor; -import buildcraft.core.DefaultProps; +import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeRenderState; -import buildcraft.transport.IconTerrainConstants; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TransportProxy; -import buildcraft.transport.pipes.PipeStructureCobblestone; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { @@ -85,52 +83,52 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { float maxSize = Utils.pipeMaxPos; PipeRenderState state = renderState.getRenderState(); - Icon[] icons = renderState.getPipeIcons(); + IIconProvider icons = renderState.getPipeIcons(); if (icons == null) return; - state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.UNKNOWN)]; + state.currentTexture = icons.getIcon(state.textureMatrix.getTextureIndex(ForgeDirection.UNKNOWN)); block.setBlockBounds(minSize, minSize, minSize, maxSize, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); if (state.pipeConnectionMatrix.isConnected(ForgeDirection.WEST)) { - state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.WEST)]; + state.currentTexture = icons.getIcon(state.textureMatrix.getTextureIndex(ForgeDirection.WEST)); block.setBlockBounds(0.0F, minSize, minSize, minSize, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.EAST)) { - state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.EAST)]; + state.currentTexture = icons.getIcon(state.textureMatrix.getTextureIndex(ForgeDirection.EAST)); block.setBlockBounds(maxSize, minSize, minSize, 1.0F, maxSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.DOWN)) { - state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.DOWN)]; + state.currentTexture = icons.getIcon(state.textureMatrix.getTextureIndex(ForgeDirection.DOWN)); block.setBlockBounds(minSize, 0.0F, minSize, maxSize, minSize, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.UP)) { - state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.UP)]; + state.currentTexture = icons.getIcon(state.textureMatrix.getTextureIndex(ForgeDirection.UP)); block.setBlockBounds(minSize, maxSize, minSize, maxSize, 1.0F, maxSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.NORTH)) { - state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.NORTH)]; + state.currentTexture = icons.getIcon(state.textureMatrix.getTextureIndex(ForgeDirection.NORTH)); block.setBlockBounds(minSize, minSize, 0.0F, maxSize, maxSize, minSize); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); } if (state.pipeConnectionMatrix.isConnected(ForgeDirection.SOUTH)) { - state.currentTexture = icons[state.textureMatrix.getTextureIndex(ForgeDirection.SOUTH)]; + state.currentTexture = icons.getIcon(state.textureMatrix.getTextureIndex(ForgeDirection.SOUTH)); block.setBlockBounds(minSize, minSize, maxSize, maxSize, maxSize, 1.0F); renderblocks.setRenderBoundsFromBlock(block); renderblocks.renderStandardBlock(block, x, y, z); @@ -139,22 +137,23 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); if (state.wireMatrix.hasWire(WireColor.Red)) { - state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Red)?IconTerrainConstants.Texture_Red_Lit:IconTerrainConstants.Texture_Red_Dark]; + state.currentTexture = BuildCraftTransport.instance.wireIconProvider.getIcon(state.wireMatrix.getWireIconIndex(WireColor.Red)); + pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMaxPos, Utils.pipeMinPos, IPipe.WireColor.Red, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Blue)) { - state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Blue)?IconTerrainConstants.Texture_Blue_Lit:IconTerrainConstants.Texture_Blue_Dark]; + state.currentTexture = BuildCraftTransport.instance.wireIconProvider.getIcon(state.wireMatrix.getWireIconIndex(WireColor.Blue)); pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMaxPos, Utils.pipeMaxPos, IPipe.WireColor.Blue, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Green)) { - state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Green)?IconTerrainConstants.Texture_Green_Lit:IconTerrainConstants.Texture_Green_Dark]; + state.currentTexture = BuildCraftTransport.instance.wireIconProvider.getIcon(state.wireMatrix.getWireIconIndex(WireColor.Green)); pipeWireRender(renderblocks, block, state, Utils.pipeMaxPos, Utils.pipeMinPos, Utils.pipeMinPos, IPipe.WireColor.Green, x, y, z); } if (state.wireMatrix.hasWire(WireColor.Yellow)) { - state.currentTexture = BuildCraftTransport.instance.terrainIcons[state.wireMatrix.isWireLit(WireColor.Yellow)?IconTerrainConstants.Texture_Yellow_Lit:IconTerrainConstants.Texture_Yellow_Dark]; + state.currentTexture = BuildCraftTransport.instance.wireIconProvider.getIcon(state.wireMatrix.getWireIconIndex(WireColor.Yellow)); pipeWireRender(renderblocks, block, state, Utils.pipeMinPos, Utils.pipeMinPos, Utils.pipeMaxPos, IPipe.WireColor.Yellow, x, y, z); } @@ -241,7 +240,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { zeroState[2][0] = Utils.pipeMinPos; zeroState[2][1] = Utils.pipeMaxPos; - state.currentTexture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.PipeStructureCobblestone]; // Structure Pipe + state.currentTexture = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.PipeStructureCobblestone); // Structure Pipe for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if (state.facadeMatrix.isConnected(direction) && !state.pipeConnectionMatrix.isConnected(direction)) { @@ -476,7 +475,7 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler { private void pipeGateRender(RenderBlocks renderblocks, Block block, PipeRenderState state, int x, int y, int z) { - state.currentTexture = BuildCraftTransport.instance.itemIcons[state.getGateIconIndex()]; + state.currentTexture = BuildCraftTransport.instance.gateIconProvider.getIcon(state.getGateIconIndex()); float min = Utils.pipeMinPos + 0.05F; float max = Utils.pipeMaxPos - 0.05F; diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index 18baef5a..0342322d 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -21,23 +21,21 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftTransport; import buildcraft.BuildCraftCore.RenderMode; +import buildcraft.BuildCraftTransport; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.DefaultProps; import buildcraft.core.render.RenderEntityBlock; import buildcraft.core.render.RenderEntityBlock.BlockInterface; import buildcraft.core.utils.Utils; import buildcraft.transport.EntityData; -import buildcraft.transport.IconTerrainConstants; import buildcraft.transport.Pipe; +import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.PipeTransportPower; @@ -195,7 +193,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { initialized = true; BlockInterface block = new BlockInterface(); - block.texture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.Texture_Cyan]; + block.texture = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.Power_Normal); float size = Utils.pipeMaxPos - Utils.pipeMinPos; @@ -221,7 +219,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glEndList(); } - block.texture = BuildCraftTransport.instance.terrainIcons[IconTerrainConstants.Texture_Red_Dark]; + block.texture = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.Power_Overload); size = Utils.pipeMaxPos - Utils.pipeMinPos; diff --git a/common/buildcraft/transport/utils/WireMatrix.java b/common/buildcraft/transport/utils/WireMatrix.java index fc3f24e7..9a634e66 100644 --- a/common/buildcraft/transport/utils/WireMatrix.java +++ b/common/buildcraft/transport/utils/WireMatrix.java @@ -10,8 +10,8 @@ import buildcraft.api.transport.IPipe; public class WireMatrix { private final boolean[] _hasWire = new boolean[IPipe.WireColor.values().length]; - private final boolean[] _wireLit = new boolean[IPipe.WireColor.values().length]; private final ConnectionMatrix _wires[] = new ConnectionMatrix[IPipe.WireColor.values().length]; + private final int[] _wireIconIndex = new int[IPipe.WireColor.values().length]; private boolean dirty = false; @@ -40,13 +40,13 @@ public class WireMatrix { _wires[color.ordinal()].setConnected(direction, value); } - public boolean isWireLit(IPipe.WireColor color){ - return _wireLit[color.ordinal()]; + public int getWireIconIndex(IPipe.WireColor color){ + return _wireIconIndex[color.ordinal()]; } - public void setWireLit(IPipe.WireColor color, boolean value){ - if (_wireLit[color.ordinal()] != value) { - _wireLit[color.ordinal()] = value; + public void setWireIndex(IPipe.WireColor color, int value){ + if (_wireIconIndex[color.ordinal()] != value){ + _wireIconIndex[color.ordinal()] = value; dirty = true; } } @@ -73,7 +73,7 @@ public class WireMatrix { for (int i = 0; i < IPipe.WireColor.values().length; i++) { data.writeBoolean(_hasWire[i]); _wires[i].writeData(data); - data.writeBoolean(_wireLit[i]); + data.writeInt(_wireIconIndex[i]); } } @@ -81,7 +81,7 @@ public class WireMatrix { for (int i = 0; i < IPipe.WireColor.values().length; i++) { _hasWire[i] = data.readBoolean(); _wires[i].readData(data); - _wireLit[i] = data.readBoolean(); + _wireIconIndex[i] = data.readInt(); } } } From 0f672972fe10df997fed6e1ff1d831933717c258 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 16 Mar 2013 09:21:48 +0100 Subject: [PATCH 18/93] Started fix on actions/triggers, untested Removed Action and Trigger from API Moved IIconProvider to API Renamed Action -> BCAction Renamed Trigger -> BCTrigger --- common/buildcraft/BuildCraftCore.java | 40 +++---- common/buildcraft/BuildCraftEnergy.java | 10 +- common/buildcraft/BuildCraftTransport.java | 40 +++---- .../{ => api}/core/IIconProvider.java | 2 +- .../buildcraft/api/gates/ActionManager.java | 6 +- common/buildcraft/api/gates/IAction.java | 6 +- common/buildcraft/api/gates/ITrigger.java | 14 ++- .../core/triggers/ActionMachineControl.java | 10 +- .../core/triggers/ActionRedstoneOutput.java | 6 +- .../triggers/ActionTriggerIconProvider.java | 100 ++++++++++++++++++ .../triggers/BCAction.java} | 18 +++- .../triggers/BCTrigger.java} | 54 +++------- .../core/triggers/TriggerInventory.java | 12 +-- .../core/triggers/TriggerLiquidContainer.java | 12 +-- .../core/triggers/TriggerMachine.java | 8 +- .../buildcraft/energy/TriggerEngineHeat.java | 14 +-- common/buildcraft/energy/gui/GuiEngine.java | 6 +- .../transport/BlockGenericPipe.java | 9 ++ .../transport/GateIconProvider.java | 4 +- .../transport/IPipeRenderState.java | 2 +- .../transport/IconItemConstants.java | 44 -------- common/buildcraft/transport/ItemGate.java | 21 ++-- common/buildcraft/transport/ItemPipe.java | 2 +- common/buildcraft/transport/Pipe.java | 14 +-- .../transport/PipeIconProvider.java | 3 +- .../buildcraft/transport/TileGenericPipe.java | 2 +- .../transport/TransportProxyClient.java | 41 ------- .../transport/WireIconProvider.java | 4 +- .../transport/pipes/PipeItemsCobblestone.java | 2 +- .../transport/pipes/PipeItemsDiamond.java | 2 +- .../transport/pipes/PipeItemsGold.java | 2 +- .../transport/pipes/PipeItemsIron.java | 2 +- .../transport/pipes/PipeItemsObsidian.java | 2 +- .../transport/pipes/PipeItemsSandstone.java | 2 +- .../transport/pipes/PipeItemsStone.java | 2 +- .../transport/pipes/PipeItemsVoid.java | 2 +- .../transport/pipes/PipeItemsWood.java | 2 +- .../pipes/PipeLiquidsCobblestone.java | 2 +- .../transport/pipes/PipeLiquidsGold.java | 2 +- .../transport/pipes/PipeLiquidsIron.java | 2 +- .../transport/pipes/PipeLiquidsSandstone.java | 2 +- .../transport/pipes/PipeLiquidsStone.java | 2 +- .../transport/pipes/PipeLiquidsVoid.java | 2 +- .../transport/pipes/PipeLiquidsWood.java | 2 +- .../transport/pipes/PipePowerGold.java | 2 +- .../transport/pipes/PipePowerStone.java | 2 +- .../transport/pipes/PipePowerWood.java | 2 +- .../pipes/PipeStructureCobblestone.java | 2 +- .../transport/render/PipeWorldRenderer.java | 2 +- .../triggers/ActionEnergyPulser.java | 8 +- .../triggers/ActionSignalOutput.java | 14 +-- .../triggers/TriggerPipeContents.java | 14 +-- .../transport/triggers/TriggerPipeSignal.java | 22 ++-- .../triggers/TriggerRedstoneInput.java | 10 +- 54 files changed, 324 insertions(+), 290 deletions(-) rename common/buildcraft/{ => api}/core/IIconProvider.java (95%) create mode 100644 common/buildcraft/core/triggers/ActionTriggerIconProvider.java rename common/buildcraft/{api/gates/Action.java => core/triggers/BCAction.java} (63%) rename common/buildcraft/{api/gates/Trigger.java => core/triggers/BCTrigger.java} (56%) delete mode 100644 common/buildcraft/transport/IconItemConstants.java diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index b458f3eb..4d9a8e59 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -23,9 +23,8 @@ import net.minecraftforge.common.Configuration; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.Property; import buildcraft.api.core.BuildCraftAPI; -import buildcraft.api.gates.Action; +import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; -import buildcraft.api.gates.Trigger; import buildcraft.api.power.PowerFramework; import buildcraft.core.BlockIndex; import buildcraft.core.BlockSpring; @@ -48,9 +47,12 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.triggers.ActionMachineControl.Mode; +import buildcraft.core.triggers.ActionTriggerIconProvider; +import buildcraft.core.triggers.BCAction; import buildcraft.core.triggers.ActionRedstoneOutput; import buildcraft.core.triggers.DefaultActionProvider; import buildcraft.core.triggers.DefaultTriggerProvider; +import buildcraft.core.triggers.BCTrigger; import buildcraft.core.triggers.TriggerInventory; import buildcraft.core.triggers.TriggerLiquidContainer; import buildcraft.core.triggers.TriggerMachine; @@ -128,23 +130,23 @@ public class BuildCraftCore { public static int markerModel; public static int oilModel; - public static Trigger triggerMachineActive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_ACTIVE, true); - public static Trigger triggerMachineInactive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_INACTIVE, false); - public static Trigger triggerEmptyInventory = new TriggerInventory(DefaultProps.TRIGGER_EMPTY_INVENTORY, TriggerInventory.State.Empty); - public static Trigger triggerContainsInventory = new TriggerInventory(DefaultProps.TRIGGER_CONTAINS_INVENTORY, TriggerInventory.State.Contains); - public static Trigger triggerSpaceInventory = new TriggerInventory(DefaultProps.TRIGGER_SPACE_INVENTORY, TriggerInventory.State.Space); - public static Trigger triggerFullInventory = new TriggerInventory(DefaultProps.TRIGGER_FULL_INVENTORY, TriggerInventory.State.Full); - public static Trigger triggerEmptyLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_EMPTY_LIQUID, TriggerLiquidContainer.State.Empty); - public static Trigger triggerContainsLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_CONTAINS_LIQUID, TriggerLiquidContainer.State.Contains); - public static Trigger triggerSpaceLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_SPACE_LIQUID, TriggerLiquidContainer.State.Space); - public static Trigger triggerFullLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_FULL_LIQUID, TriggerLiquidContainer.State.Full); - public static Trigger triggerRedstoneActive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_ACTIVE, true); - public static Trigger triggerRedstoneInactive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_INACTIVE, false); + public static BCTrigger triggerMachineActive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_ACTIVE, true); + public static BCTrigger triggerMachineInactive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_INACTIVE, false); + public static BCTrigger triggerEmptyInventory = new TriggerInventory(DefaultProps.TRIGGER_EMPTY_INVENTORY, TriggerInventory.State.Empty); + public static BCTrigger triggerContainsInventory = new TriggerInventory(DefaultProps.TRIGGER_CONTAINS_INVENTORY, TriggerInventory.State.Contains); + public static BCTrigger triggerSpaceInventory = new TriggerInventory(DefaultProps.TRIGGER_SPACE_INVENTORY, TriggerInventory.State.Space); + public static BCTrigger triggerFullInventory = new TriggerInventory(DefaultProps.TRIGGER_FULL_INVENTORY, TriggerInventory.State.Full); + public static BCTrigger triggerEmptyLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_EMPTY_LIQUID, TriggerLiquidContainer.State.Empty); + public static BCTrigger triggerContainsLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_CONTAINS_LIQUID, TriggerLiquidContainer.State.Contains); + public static BCTrigger triggerSpaceLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_SPACE_LIQUID, TriggerLiquidContainer.State.Space); + public static BCTrigger triggerFullLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_FULL_LIQUID, TriggerLiquidContainer.State.Full); + public static BCTrigger triggerRedstoneActive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_ACTIVE, true); + public static BCTrigger triggerRedstoneInactive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_INACTIVE, false); - public static Action actionRedstone = new ActionRedstoneOutput(DefaultProps.ACTION_REDSTONE); - public static Action actionOn = new ActionMachineControl(DefaultProps.ACTION_ON, Mode.On); - public static Action actionOff = new ActionMachineControl(DefaultProps.ACTION_OFF, Mode.Off); - public static Action actionLoop = new ActionMachineControl(DefaultProps.ACTION_LOOP, Mode.Loop); + public static BCAction actionRedstone = new ActionRedstoneOutput(DefaultProps.ACTION_REDSTONE); + public static BCAction actionOn = new ActionMachineControl(DefaultProps.ACTION_ON, Mode.On); + public static BCAction actionOff = new ActionMachineControl(DefaultProps.ACTION_OFF, Mode.Off); + public static BCAction actionLoop = new ActionMachineControl(DefaultProps.ACTION_LOOP, Mode.Loop); public static boolean loadDefaultRecipes = true; public static boolean forcePneumaticPower = true; @@ -153,6 +155,8 @@ public class BuildCraftCore { public static BptItem[] itemBptProps = new BptItem[Item.itemsList.length]; public static Logger bcLog = Logger.getLogger("Buildcraft"); + + public IIconProvider actionTriggerIconProvider = new ActionTriggerIconProvider(); @Instance("BuildCraft|Core") public static BuildCraftCore instance; diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index c3d16e70..c00b61f3 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -24,7 +24,6 @@ import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import buildcraft.api.fuels.IronEngineCoolant; import buildcraft.api.fuels.IronEngineFuel; -import buildcraft.api.gates.Trigger; import buildcraft.api.recipes.RefineryRecipe; import buildcraft.core.BlockIndex; import buildcraft.core.DefaultProps; @@ -32,6 +31,7 @@ import buildcraft.core.ItemBuildCraft; import buildcraft.core.Version; import buildcraft.core.network.PacketHandler; import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.triggers.BCTrigger; import buildcraft.energy.BlockEngine; import buildcraft.energy.BlockOilFlowing; import buildcraft.energy.BlockOilStill; @@ -76,10 +76,10 @@ public class BuildCraftEnergy { public static TreeMap saturationStored = new TreeMap(); - public static Trigger triggerBlueEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_BLUE_ENGINE_HEAT, EnergyStage.Blue); - public static Trigger triggerGreenEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_GREEN_ENGINE_HEAT, EnergyStage.Green); - public static Trigger triggerYellowEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_YELLOW_ENGINE_HEAT, EnergyStage.Yellow); - public static Trigger triggerRedEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_RED_ENGINE_HEAT, EnergyStage.Red); + public static BCTrigger triggerBlueEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_BLUE_ENGINE_HEAT, EnergyStage.Blue); + public static BCTrigger triggerGreenEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_GREEN_ENGINE_HEAT, EnergyStage.Green); + public static BCTrigger triggerYellowEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_YELLOW_ENGINE_HEAT, EnergyStage.Yellow); + public static BCTrigger triggerRedEngineHeat = new TriggerEngineHeat(DefaultProps.TRIGGER_RED_ENGINE_HEAT, EnergyStage.Red); @Instance("BuildCraft|Energy") public static BuildCraftEnergy instance; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 605ac78c..b2b43fc3 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -20,18 +20,18 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; -import buildcraft.api.gates.Action; +import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; -import buildcraft.api.gates.Trigger; import buildcraft.api.recipes.AssemblyRecipe; import buildcraft.api.transport.IExtractionHandler; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.PipeManager; import buildcraft.core.DefaultProps; -import buildcraft.core.IIconProvider; import buildcraft.core.ItemBuildCraft; import buildcraft.core.Version; import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.triggers.BCAction; +import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.GateIconProvider; import buildcraft.transport.GuiHandler; @@ -147,24 +147,24 @@ public class BuildCraftTransport { public static Item pipeStructureCobblestone; public static int groupItemsTrigger; - public static Trigger triggerPipeEmpty = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_EMPTY, Kind.Empty); - public static Trigger triggerPipeItems = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_ITEMS, Kind.ContainsItems); - public static Trigger triggerPipeLiquids = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_LIQUIDS, Kind.ContainsLiquids); - public static Trigger triggerPipeEnergy = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_ENERGY, Kind.ContainsEnergy); - public static Trigger triggerRedSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_RED_SIGNAL_ACTIVE, true, IPipe.WireColor.Red); - public static Trigger triggerRedSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_RED_SIGNAL_INACTIVE, false, IPipe.WireColor.Red); - public static Trigger triggerBlueSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_BLUE_SIGNAL_ACTIVE, true, IPipe.WireColor.Blue); - public static Trigger triggerBlueSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_BLUE_SIGNAL_INACTIVE, false, IPipe.WireColor.Blue); - public static Trigger triggerGreenSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_GREEN_SIGNAL_ACTIVE, true, IPipe.WireColor.Green); - public static Trigger triggerGreenSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_GREEN_SIGNAL_INACTIVE, false, IPipe.WireColor.Green); - public static Trigger triggerYellowSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_YELLOW_SIGNAL_ACTIVE, true, IPipe.WireColor.Yellow); - public static Trigger triggerYellowSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_YELLOW_SIGNAL_INACTIVE, false, IPipe.WireColor.Yellow); + public static BCTrigger triggerPipeEmpty = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_EMPTY, Kind.Empty); + public static BCTrigger triggerPipeItems = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_ITEMS, Kind.ContainsItems); + public static BCTrigger triggerPipeLiquids = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_LIQUIDS, Kind.ContainsLiquids); + public static BCTrigger triggerPipeEnergy = new TriggerPipeContents(DefaultProps.TRIGGER_PIPE_ENERGY, Kind.ContainsEnergy); + public static BCTrigger triggerRedSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_RED_SIGNAL_ACTIVE, true, IPipe.WireColor.Red); + public static BCTrigger triggerRedSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_RED_SIGNAL_INACTIVE, false, IPipe.WireColor.Red); + public static BCTrigger triggerBlueSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_BLUE_SIGNAL_ACTIVE, true, IPipe.WireColor.Blue); + public static BCTrigger triggerBlueSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_BLUE_SIGNAL_INACTIVE, false, IPipe.WireColor.Blue); + public static BCTrigger triggerGreenSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_GREEN_SIGNAL_ACTIVE, true, IPipe.WireColor.Green); + public static BCTrigger triggerGreenSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_GREEN_SIGNAL_INACTIVE, false, IPipe.WireColor.Green); + public static BCTrigger triggerYellowSignalActive = new TriggerPipeSignal(DefaultProps.TRIGGER_YELLOW_SIGNAL_ACTIVE, true, IPipe.WireColor.Yellow); + public static BCTrigger triggerYellowSignalInactive = new TriggerPipeSignal(DefaultProps.TRIGGER_YELLOW_SIGNAL_INACTIVE, false, IPipe.WireColor.Yellow); - public static Action actionRedSignal = new ActionSignalOutput(DefaultProps.ACTION_RED_SIGNAL, IPipe.WireColor.Red); - public static Action actionBlueSignal = new ActionSignalOutput(DefaultProps.ACTION_BLUE_SIGNAL, IPipe.WireColor.Blue); - public static Action actionGreenSignal = new ActionSignalOutput(DefaultProps.ACTION_GREEN_SIGNAL, IPipe.WireColor.Green); - public static Action actionYellowSignal = new ActionSignalOutput(DefaultProps.ACTION_YELLOW_SIGNAL, IPipe.WireColor.Yellow); - public static Action actionEnergyPulser = new ActionEnergyPulser(DefaultProps.ACTION_ENERGY_PULSER); + public static BCAction actionRedSignal = new ActionSignalOutput(DefaultProps.ACTION_RED_SIGNAL, IPipe.WireColor.Red); + public static BCAction actionBlueSignal = new ActionSignalOutput(DefaultProps.ACTION_BLUE_SIGNAL, IPipe.WireColor.Blue); + public static BCAction actionGreenSignal = new ActionSignalOutput(DefaultProps.ACTION_GREEN_SIGNAL, IPipe.WireColor.Green); + public static BCAction actionYellowSignal = new ActionSignalOutput(DefaultProps.ACTION_YELLOW_SIGNAL, IPipe.WireColor.Yellow); + public static BCAction actionEnergyPulser = new ActionEnergyPulser(DefaultProps.ACTION_ENERGY_PULSER); @Instance("BuildCraft|Transport") public static BuildCraftTransport instance; diff --git a/common/buildcraft/core/IIconProvider.java b/common/buildcraft/api/core/IIconProvider.java similarity index 95% rename from common/buildcraft/core/IIconProvider.java rename to common/buildcraft/api/core/IIconProvider.java index 9f7a4195..dc259761 100644 --- a/common/buildcraft/core/IIconProvider.java +++ b/common/buildcraft/api/core/IIconProvider.java @@ -1,4 +1,4 @@ -package buildcraft.core; +package buildcraft.api.core; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; diff --git a/common/buildcraft/api/gates/ActionManager.java b/common/buildcraft/api/gates/ActionManager.java index e81bece6..4c79dede 100644 --- a/common/buildcraft/api/gates/ActionManager.java +++ b/common/buildcraft/api/gates/ActionManager.java @@ -5,11 +5,13 @@ import java.util.LinkedList; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import buildcraft.api.transport.IPipe; +import buildcraft.core.triggers.BCAction; +import buildcraft.core.triggers.BCTrigger; public class ActionManager { - public static Trigger[] triggers = new Trigger[1024]; - public static Action[] actions = new Action[1024]; + public static ITrigger[] triggers = new ITrigger[1024]; + public static IAction[] actions = new IAction[1024]; private static LinkedList triggerProviders = new LinkedList(); private static LinkedList actionProviders = new LinkedList(); diff --git a/common/buildcraft/api/gates/IAction.java b/common/buildcraft/api/gates/IAction.java index 7f1097d7..c57efc69 100644 --- a/common/buildcraft/api/gates/IAction.java +++ b/common/buildcraft/api/gates/IAction.java @@ -1,5 +1,6 @@ package buildcraft.api.gates; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; @@ -10,7 +11,10 @@ public interface IAction { @SideOnly(Side.CLIENT) Icon getTexture(); - + + @SideOnly(Side.CLIENT) + IIconProvider getIconProvider(); + boolean hasParameter(); String getDescription(); diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java index b7f10be3..017e7ec2 100644 --- a/common/buildcraft/api/gates/ITrigger.java +++ b/common/buildcraft/api/gates/ITrigger.java @@ -1,5 +1,6 @@ package buildcraft.api.gates; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; @@ -13,26 +14,29 @@ public interface ITrigger { * Return the texture file for this trigger icon */ @SideOnly(Side.CLIENT) - public abstract Icon getTextureIcon(); + public Icon getTextureIcon(); + + @SideOnly(Side.CLIENT) + public IIconProvider getIconProvider(); /** * Return true if this trigger can accept parameters */ - public abstract boolean hasParameter(); + public boolean hasParameter(); /** * Return the trigger description in the UI */ - public abstract String getDescription(); + public String getDescription(); /** * Return true if the tile given in parameter activates the trigger, given the parameters. */ - public abstract boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter); + public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter); /** * Create parameters for the trigger. As for now, there is only one kind of trigger parameter available so this subprogram is final. */ - public abstract ITriggerParameter createParameter(); + public ITriggerParameter createParameter(); } diff --git a/common/buildcraft/core/triggers/ActionMachineControl.java b/common/buildcraft/core/triggers/ActionMachineControl.java index 957fb495..b609d636 100644 --- a/common/buildcraft/core/triggers/ActionMachineControl.java +++ b/common/buildcraft/core/triggers/ActionMachineControl.java @@ -4,11 +4,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; import buildcraft.BuildCraftTransport; -import buildcraft.api.gates.Action; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconItemConstants; -public class ActionMachineControl extends Action { +public class ActionMachineControl extends BCAction { public enum Mode { Unknown, On, Off, Loop @@ -41,11 +39,11 @@ public class ActionMachineControl extends Action { public Icon getTexture() { switch (mode) { case On: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_On]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Action_MachineControl_On); case Off: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_Off]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Action_MachineControl_Off); case Loop: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Action_MachineControl_Loop]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Action_MachineControl_Loop); default: return null; } diff --git a/common/buildcraft/core/triggers/ActionRedstoneOutput.java b/common/buildcraft/core/triggers/ActionRedstoneOutput.java index 63df04f3..199e7b9b 100644 --- a/common/buildcraft/core/triggers/ActionRedstoneOutput.java +++ b/common/buildcraft/core/triggers/ActionRedstoneOutput.java @@ -13,11 +13,9 @@ import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftTransport; -import buildcraft.api.gates.Action; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconItemConstants; -public class ActionRedstoneOutput extends Action { +public class ActionRedstoneOutput extends BCAction { public ActionRedstoneOutput(int id) { super(id); @@ -31,6 +29,6 @@ public class ActionRedstoneOutput extends Action { @Override @SideOnly(Side.CLIENT) public Icon getTexture() { - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_RedstoneInput_Active); } } diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java new file mode 100644 index 00000000..3f6b56f9 --- /dev/null +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -0,0 +1,100 @@ +package buildcraft.core.triggers; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.core.IIconProvider; + +public class ActionTriggerIconProvider implements IIconProvider { + + public static final int Action_MachineControl_On = 0; + public static final int Action_MachineControl_Off = 1; + public static final int Action_MachineControl_Loop = 2; + + public static final int Trigger_EngineHeat_Blue = 3; + public static final int Trigger_EngineHeat_Green = 4; + public static final int Trigger_EngineHeat_Yellow = 5; + public static final int Trigger_EngineHeat_Red = 6; + public static final int Trigger_Inventory_Empty = 7; + public static final int Trigger_Inventory_Contains = 8; + public static final int Trigger_Inventory_Space = 9; + public static final int Trigger_Inventory_Full = 10; + public static final int Trigger_LiquidContainer_Empty = 11; + public static final int Trigger_LiquidContainer_Contains = 12; + public static final int Trigger_LiquidContainer_Space = 13; + public static final int Trigger_LiquidContainer_Full = 14; + public static final int Trigger_Machine_Active = 15; + public static final int Trigger_Machine_Inactive = 16; + public static final int Trigger_PipeContents_Empty = 17; + public static final int Trigger_PipeContents_ContainsItems = 18; + public static final int Trigger_PipeContents_ContainsLiquid = 19; + public static final int Trigger_PipeContents_ContainsEnergy = 20; + public static final int Trigger_PipeSignal_Red_Active = 21; + public static final int Trigger_PipeSignal_Blue_Active = 22; + public static final int Trigger_PipeSignal_Green_Active = 23; + public static final int Trigger_PipeSignal_Yellow_Active = 24; + public static final int Trigger_PipeSignal_Red_Inactive = 25; + public static final int Trigger_PipeSignal_Blue_Inactive = 26; + public static final int Trigger_PipeSignal_Green_Inactive = 27; + public static final int Trigger_PipeSignal_Yellow_Inactive = 28; + public static final int Trigger_RedstoneInput_Active = 29; + public static final int Trigger_RedstoneInput_Inactive = 30; + + public static final int MAX = 31; + + + @SideOnly(Side.CLIENT) + private Icon[] icons; + + private boolean registered = false; + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int iconIndex) { + return icons[iconIndex]; + } + + @Override + @SideOnly(Side.CLIENT) + public void RegisterIcons(IconRegister iconRegister) { + if (registered) return; + registered = true; + icons = new Icon[MAX]; + + icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.func_94245_a("buildcraft:triggers/action_machinecontrol_on"); + icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.func_94245_a("buildcraft:triggers/action_machinecontrol_off"); + icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.func_94245_a("buildcraft:triggers/action_machinecontrol_loop"); + + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_blue"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_green"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_yellow"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Red] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_red"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Empty] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_empty"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Contains] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_contains"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Space] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_space"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Full] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_full"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Empty] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_empty"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Contains] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_contains"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Space] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_space"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Full] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_full"); + icons[ActionTriggerIconProvider.Trigger_Machine_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_machine_active"); + icons[ActionTriggerIconProvider.Trigger_Machine_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_machine_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_Empty] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_empty"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsitems"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsliquid"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsenergy"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_redstoneinput_active"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_redstoneinput_inactive"); + + } + +} diff --git a/common/buildcraft/api/gates/Action.java b/common/buildcraft/core/triggers/BCAction.java similarity index 63% rename from common/buildcraft/api/gates/Action.java rename to common/buildcraft/core/triggers/BCAction.java index b0a1e6d7..2feb3fd1 100644 --- a/common/buildcraft/api/gates/Action.java +++ b/common/buildcraft/core/triggers/BCAction.java @@ -7,17 +7,21 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.api.gates; +package buildcraft.core.triggers; +import buildcraft.BuildCraftCore; +import buildcraft.api.core.IIconProvider; +import buildcraft.api.gates.ActionManager; +import buildcraft.api.gates.IAction; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; -public abstract class Action implements IAction { +public abstract class BCAction implements IAction { protected int id; - public Action(int id) { + public BCAction(int id) { this.id = id; ActionManager.actions[id] = this; } @@ -40,4 +44,12 @@ public abstract class Action implements IAction { public String getDescription() { return ""; } + + @Override + @SideOnly(Side.CLIENT) + public IIconProvider getIconProvider() { + return BuildCraftCore.instance.actionTriggerIconProvider; + } + + } diff --git a/common/buildcraft/api/gates/Trigger.java b/common/buildcraft/core/triggers/BCTrigger.java similarity index 56% rename from common/buildcraft/api/gates/Trigger.java rename to common/buildcraft/core/triggers/BCTrigger.java index 1f26b7e3..7e607abf 100644 --- a/common/buildcraft/api/gates/Trigger.java +++ b/common/buildcraft/core/triggers/BCTrigger.java @@ -7,8 +7,14 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.api.gates; +package buildcraft.core.triggers; +import buildcraft.BuildCraftCore; +import buildcraft.api.core.IIconProvider; +import buildcraft.api.gates.ActionManager; +import buildcraft.api.gates.ITrigger; +import buildcraft.api.gates.ITriggerParameter; +import buildcraft.api.gates.TriggerParameter; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; @@ -18,73 +24,45 @@ import net.minecraft.util.Icon; * This class has to be implemented to create new triggers kinds to BuildCraft gates. There is an instance per kind, which will get called wherever the trigger * can be active. */ -public abstract class Trigger implements ITrigger { +public abstract class BCTrigger implements ITrigger { protected int id; - /** - * Creates a new triggers, and stores it in the trigger list - */ - public Trigger(int id) { + public BCTrigger(int id) { this.id = id; ActionManager.triggers[id] = this; } - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.gates.ITrigger#getId() - */ @Override public int getId() { return this.id; } - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.gates.ITrigger#getTextureFile() - */ - @SideOnly(Side.CLIENT) @Override + @SideOnly(Side.CLIENT) public abstract Icon getTextureIcon(); + + @Override + @SideOnly(Side.CLIENT) + public IIconProvider getIconProvider() { + return BuildCraftCore.instance.actionTriggerIconProvider; + } - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.gates.ITrigger#hasParameter() - */ @Override public boolean hasParameter() { return false; } - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.gates.ITrigger#getDescription() - */ @Override public String getDescription() { return ""; } - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.gates.ITrigger#isTriggerActive(net.minecraft.src.TileEntity, - * net.minecraft.src.buildcraft.api.gates.TriggerParameter) - */ @Override public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) { return false; } - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.gates.ITrigger#createParameter() - */ @Override public final ITriggerParameter createParameter() { return new TriggerParameter(); diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index 8dbdb111..515d95f0 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -20,13 +20,11 @@ import net.minecraftforge.common.ISidedInventory; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerDirectional; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; import buildcraft.core.utils.SidedInventoryAdapter; import buildcraft.core.utils.Utils; -import buildcraft.transport.IconItemConstants; -public class TriggerInventory extends Trigger implements ITriggerDirectional { +public class TriggerInventory extends BCTrigger implements ITriggerDirectional { public enum State { Empty, Contains, Space, Full @@ -129,13 +127,13 @@ public class TriggerInventory extends Trigger implements ITriggerDirectional { public Icon getTextureIcon() { switch (state) { case Empty: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Empty]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_Inventory_Empty); case Contains: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Contains]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_Inventory_Contains); case Space: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Space]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_Inventory_Space); default: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Inventory_Full]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_Inventory_Full); } } } diff --git a/common/buildcraft/core/triggers/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java index c767a26c..35153105 100644 --- a/common/buildcraft/core/triggers/TriggerLiquidContainer.java +++ b/common/buildcraft/core/triggers/TriggerLiquidContainer.java @@ -20,11 +20,9 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconItemConstants; -public class TriggerLiquidContainer extends Trigger { +public class TriggerLiquidContainer extends BCTrigger { public enum State { Empty, Contains, Space, Full @@ -132,13 +130,13 @@ public class TriggerLiquidContainer extends Trigger { public Icon getTextureIcon() { switch (state) { case Empty: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Empty]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_LiquidContainer_Empty); case Contains: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Contains]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_LiquidContainer_Contains); case Space: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Space]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_LiquidContainer_Space); default: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Full]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_LiquidContainer_Full); } } } diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 7bdf92ec..132b2186 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -15,12 +15,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; import buildcraft.core.IMachine; -import buildcraft.transport.IconItemConstants; -public class TriggerMachine extends Trigger { +public class TriggerMachine extends BCTrigger { boolean active; @@ -56,8 +54,8 @@ public class TriggerMachine extends Trigger { @SideOnly(Side.CLIENT) public Icon getTextureIcon() { if (active) - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_Machine_Active); else - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Inactive]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_Machine_Inactive); } } diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java index 4395093a..db723c3c 100644 --- a/common/buildcraft/energy/TriggerEngineHeat.java +++ b/common/buildcraft/energy/TriggerEngineHeat.java @@ -15,11 +15,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconItemConstants; +import buildcraft.core.triggers.ActionTriggerIconProvider; +import buildcraft.core.triggers.BCTrigger; -public class TriggerEngineHeat extends Trigger { +public class TriggerEngineHeat extends BCTrigger { public Engine.EnergyStage stage; @@ -59,13 +59,13 @@ public class TriggerEngineHeat extends Trigger { public Icon getTextureIcon() { switch (stage) { case Blue: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Blue]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_EngineHeat_Blue); case Green: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Green]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_EngineHeat_Green); case Yellow: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Yellow]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_EngineHeat_Yellow); default: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Red]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_EngineHeat_Red); } } } diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index b2e8269a..14ee284f 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -1,6 +1,9 @@ package buildcraft.energy.gui; +import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import buildcraft.BuildCraftTransport; import buildcraft.core.DefaultProps; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.GuiBuildCraft; @@ -30,7 +33,8 @@ public abstract class GuiEngine extends GuiBuildCraft { drawBackground(x, y); // Draw icon - drawIcon(DefaultProps.TEXTURE_ICONS, 0, x + 3, y + 4); + //drawIcon(DefaultProps.TEXTURE_ICONS, 0, x + 3, y + 4); + drawIcon(BuildCraftTransport.instance.wireIconProvider.getIcon(0), x + 3, y + 4); if (!isFullyOpened()) return; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 4d80eb1d..95d4e04f 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -35,6 +35,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; +import buildcraft.api.gates.ActionManager; +import buildcraft.api.gates.IAction; +import buildcraft.api.gates.ITrigger; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipe; import buildcraft.core.BlockIndex; @@ -61,6 +64,8 @@ public class BlockGenericPipe extends BlockContainer { public MovingObjectPosition movingObjectPosition; } + private boolean skippedFirstIconRegister; + /* Defined subprograms ************************************************* */ public BlockGenericPipe(int i) { @@ -855,6 +860,10 @@ public class BlockGenericPipe extends BlockContainer { @SideOnly(Side.CLIENT) public void func_94332_a(IconRegister iconRegister) { + if (!skippedFirstIconRegister){ + skippedFirstIconRegister = true; + return; + } BuildCraftTransport.instance.gateIconProvider.RegisterIcons(iconRegister); BuildCraftTransport.instance.wireIconProvider.RegisterIcons(iconRegister); for (int i : pipes.keySet()){ diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index 605ab39f..b3a2e257 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; public class GateIconProvider implements IIconProvider { @@ -55,6 +55,8 @@ public class GateIconProvider implements IIconProvider { @SideOnly(Side.CLIENT) public void RegisterIcons(IconRegister iconRegister) { if (registered) return; + registered = true; + icons = new Icon[MAX]; icons[GateIconProvider.Gate_Dark] = iconRegister.func_94245_a("buildcraft:gate_dark"); icons[GateIconProvider.Gate_Lit] = iconRegister.func_94245_a("buildcraft:gate_lit"); diff --git a/common/buildcraft/transport/IPipeRenderState.java b/common/buildcraft/transport/IPipeRenderState.java index 0141effa..8c748259 100644 --- a/common/buildcraft/transport/IPipeRenderState.java +++ b/common/buildcraft/transport/IPipeRenderState.java @@ -1,6 +1,6 @@ package buildcraft.transport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; diff --git a/common/buildcraft/transport/IconItemConstants.java b/common/buildcraft/transport/IconItemConstants.java deleted file mode 100644 index 5f1baae7..00000000 --- a/common/buildcraft/transport/IconItemConstants.java +++ /dev/null @@ -1,44 +0,0 @@ -package buildcraft.transport; - -public class IconItemConstants { - - - - - public static final int Action_MachineControl_On = 14; - public static final int Action_MachineControl_Off = 15; - public static final int Action_MachineControl_Loop = 16; - - public static final int Trigger_EngineHeat_Blue = 18; - public static final int Trigger_EngineHeat_Green = 19; - public static final int Trigger_EngineHeat_Yellow = 20; - public static final int Trigger_EngineHeat_Red = 21; - public static final int Trigger_Inventory_Empty = 22; - public static final int Trigger_Inventory_Contains = 23; - public static final int Trigger_Inventory_Space = 24; - public static final int Trigger_Inventory_Full = 25; - public static final int Trigger_LiquidContainer_Empty = 26; - public static final int Trigger_LiquidContainer_Contains = 27; - public static final int Trigger_LiquidContainer_Space = 28; - public static final int Trigger_LiquidContainer_Full = 29; - public static final int Trigger_Machine_Active = 30; - public static final int Trigger_Machine_Inactive = 31; - public static final int Trigger_PipeContents_Empty = 32; - public static final int Trigger_PipeContents_ContainsItems = 33; - public static final int Trigger_PipeContents_ContainsLiquid = 34; - public static final int Trigger_PipeContents_ContainsEnergy = 35; - public static final int Trigger_PipeSignal_Red_Active = 36; - public static final int Trigger_PipeSignal_Blue_Active = 37; - public static final int Trigger_PipeSignal_Green_Active = 38; - public static final int Trigger_PipeSignal_Yellow_Active = 39; - public static final int Trigger_PipeSignal_Red_Inactive = 40; - public static final int Trigger_PipeSignal_Blue_Inactive = 41; - public static final int Trigger_PipeSignal_Green_Inactive = 42; - public static final int Trigger_PipeSignal_Yellow_Inactive = 43; - public static final int Trigger_RedstoneInput_Active = 44; - public static final int Trigger_RedstoneInput_Inactive = 45; - - public static final int MAX = 46; - - -} diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index f3a33b57..e203db61 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -10,6 +10,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import buildcraft.BuildCraftTransport; +import buildcraft.api.gates.ActionManager; +import buildcraft.api.gates.IAction; +import buildcraft.api.gates.ITrigger; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; @@ -52,13 +55,6 @@ public class ItemGate extends ItemBuildCraft { @Override @SideOnly(Side.CLIENT) public Icon getIconFromDamage(int i) { - int n = 0; - if (series > 0) { - n = 3; - } else { - n = 2; - } - if (series == 0){ //Normal Gates switch (i) { case 0: @@ -119,6 +115,17 @@ public class ItemGate extends ItemBuildCraft { @SideOnly(Side.CLIENT) public void func_94581_a(IconRegister iconRegister) { + + for (IAction action : ActionManager.actions){ + if (action == null) continue; + action.getIconProvider().RegisterIcons(iconRegister); + } + + for (ITrigger trigger : ActionManager.triggers){ + if (trigger == null) continue; + trigger.getIconProvider().RegisterIcons(iconRegister); + } + icons = new Icon[ItemGate.MAX]; icons[ItemGate.Gate] = iconRegister.func_94245_a("buildcraft:gate"); icons[ItemGate.Gate_Iron_And] = iconRegister.func_94245_a("buildcraft:gate_iron_and"); diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 904c6cd7..5fab1dfc 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -18,8 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.IIconProvider; import buildcraft.core.IItemPipe; import buildcraft.core.ItemBuildCraft; import buildcraft.BuildCraftCore; diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 8b2f01a0..410b1e24 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -28,21 +28,21 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.SafeTimeTracker; -import buildcraft.api.gates.Action; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionReceptor; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerDirectional; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.api.gates.TriggerParameter; import buildcraft.api.transport.IPipe; import buildcraft.core.IDropControlInventory; -import buildcraft.core.IIconProvider; import buildcraft.core.network.TilePacketWrapper; +import buildcraft.core.triggers.BCAction; import buildcraft.core.triggers.ActionRedstoneOutput; +import buildcraft.core.triggers.BCTrigger; import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateConditional; import buildcraft.transport.pipes.PipeLogic; @@ -71,9 +71,9 @@ public abstract class Pipe implements IPipe, IDropControlInventory { @SuppressWarnings("rawtypes") private static Map networkWrappers = new HashMap(); - public ITrigger[] activatedTriggers = new Trigger[8]; + public ITrigger[] activatedTriggers = new BCTrigger[8]; public ITriggerParameter[] triggerParameters = new ITriggerParameter[8]; - public IAction[] activatedActions = new Action[8]; + public IAction[] activatedActions = new BCAction[8]; public boolean broadcastSignal[] = new boolean[] { false, false, false, false }; public boolean broadcastRedstone = false; @@ -529,9 +529,9 @@ public abstract class Pipe implements IPipe, IDropControlInventory { public void resetGate() { gate = null; - activatedTriggers = new Trigger[activatedTriggers.length]; + activatedTriggers = new BCTrigger[activatedTriggers.length]; triggerParameters = new ITriggerParameter[triggerParameters.length]; - activatedActions = new Action[activatedActions.length]; + activatedActions = new BCAction[activatedActions.length]; broadcastSignal = new boolean[] { false, false, false, false }; if (broadcastRedstone) { updateNeighbors(true); diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index 3f1ab00c..156a3f0d 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; public class PipeIconProvider implements IIconProvider { @@ -60,6 +60,7 @@ public class PipeIconProvider implements IIconProvider { @SideOnly(Side.CLIENT) public void RegisterIcons(IconRegister iconRegister) { if (registered) return; + registered = true; _icons = new Icon[PipeIconProvider.MAX]; diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 27249f9f..d6cf554f 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -30,6 +30,7 @@ import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.gates.IOverrideDefaultTriggers; @@ -45,7 +46,6 @@ import buildcraft.api.transport.IPipedItem; import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; import buildcraft.core.IDropControlInventory; -import buildcraft.core.IIconProvider; import buildcraft.core.ITileBufferHolder; import buildcraft.core.TileBuffer; import buildcraft.core.network.IClientState; diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index bdf6378d..88bb0a4e 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -65,45 +65,4 @@ public class TransportProxyClient extends TransportProxy { public void setIconProviderFromPipe(ItemPipe item, Pipe dummyPipe) { item.setPipesIcons(dummyPipe.getIconProvider()); } - -// -// @Override -// public void loadItemIcons(BuildCraftTransport instance) { -// TextureMap itemTextures = Minecraft.getMinecraft().renderEngine.field_94155_m; -// -// -// instance.itemIcons[IconItemConstants.Action_MachineControl_On] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_on"); -// instance.itemIcons[IconItemConstants.Action_MachineControl_Off] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_off"); -// instance.itemIcons[IconItemConstants.Action_MachineControl_Loop] = itemTextures.func_94245_a("buildcraft:triggers/action_machinecontrol_loop"); -// -// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Blue] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_blue"); -// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Green] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_green"); -// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Yellow] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_yellow"); -// instance.itemIcons[IconItemConstants.Trigger_EngineHeat_Red] = itemTextures.func_94245_a("buildcraft:triggers/trigger_engineheat_red"); -// instance.itemIcons[IconItemConstants.Trigger_Inventory_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_empty"); -// instance.itemIcons[IconItemConstants.Trigger_Inventory_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_contains"); -// instance.itemIcons[IconItemConstants.Trigger_Inventory_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_space"); -// instance.itemIcons[IconItemConstants.Trigger_Inventory_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_inventory_full"); -// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_empty"); -// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Contains] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_contains"); -// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Space] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_space"); -// instance.itemIcons[IconItemConstants.Trigger_LiquidContainer_Full] = itemTextures.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_full"); -// instance.itemIcons[IconItemConstants.Trigger_Machine_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_active"); -// instance.itemIcons[IconItemConstants.Trigger_Machine_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_machine_inactive"); -// instance.itemIcons[IconItemConstants.Trigger_PipeContents_Empty] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_empty"); -// instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsItems] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsitems"); -// instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsLiquid] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsliquid"); -// instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsEnergy] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsenergy"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_active"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_inactive"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_active"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_inactive"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_active"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_inactive"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_active"); -// instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); -// instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_active"); -// instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Inactive] = itemTextures.func_94245_a("buildcraft:triggers/trigger_redstoneinput_inactive"); -// -// } } diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index cb5eb191..332becf3 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; public class WireIconProvider implements IIconProvider { @@ -34,6 +34,8 @@ public class WireIconProvider implements IIconProvider { @SideOnly(Side.CLIENT) public void RegisterIcons(IconRegister iconRegister) { if (registered) return; + registered = true; + icons = new Icon[MAX]; icons[WireIconProvider.Texture_Red_Dark] = iconRegister.func_94245_a("buildcraft:texture_red_dark"); diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index 961f293f..2f693abe 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index 25064219..e8f2abac 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -19,9 +19,9 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.IIconProvider; import buildcraft.core.network.IClientState; import buildcraft.transport.IPipeTransportItemsHook; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index c3745db1..d39653a7 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -12,9 +12,9 @@ import java.util.LinkedList; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 2ac44b3e..8fd64a62 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index 486d8e3e..d8e070db 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -20,13 +20,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.api.transport.IPipedItem; import buildcraft.core.EntityPassiveItem; -import buildcraft.core.IIconProvider; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index 8e9cb18e..dd2a79e6 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -11,7 +11,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index 699f476a..0b07ac2d 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -12,9 +12,9 @@ import java.util.LinkedList; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.transport.IPipedItem; -import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeTransportItemsHook; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index 40a601fd..225aa334 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -12,7 +12,7 @@ package buildcraft.transport.pipes; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.EntityData; import buildcraft.transport.IItemTravelingHook; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index df3198fa..777dae89 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.inventory.ISpecialInventory; import buildcraft.api.power.IPowerProvider; @@ -23,7 +24,6 @@ import buildcraft.api.power.PowerFramework; import buildcraft.api.transport.IPipedItem; import buildcraft.api.transport.PipeManager; import buildcraft.core.EntityPassiveItem; -import buildcraft.core.IIconProvider; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.utils.Utils; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java index f8aba53e..ff9fca16 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsCobblestone.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsGold.java b/common/buildcraft/transport/pipes/PipeLiquidsGold.java index 614b5420..dfe2372f 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsGold.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsGold.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsIron.java b/common/buildcraft/transport/pipes/PipeLiquidsIron.java index 1b615307..a7cf4990 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsIron.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsIron.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java index 00a47c0a..b787858c 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsSandstone.java @@ -12,7 +12,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.IPipeTransportLiquidsHook; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsStone.java b/common/buildcraft/transport/pipes/PipeLiquidsStone.java index 8e1420b5..51e8c37f 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsStone.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsStone.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportLiquids; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java index 6a191027..56665e95 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsVoid.java @@ -12,7 +12,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.IPipeTransportLiquidsHook; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index d2193dda..6acaea61 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -15,12 +15,12 @@ import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; import buildcraft.api.transport.PipeManager; -import buildcraft.core.IIconProvider; import buildcraft.core.RedstonePowerFramework; import buildcraft.core.network.TileNetworkData; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index 0e0b9d55..3d673b1f 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index 8b6c91f0..082fdbab 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -10,7 +10,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportPower; diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 010742a0..e152a07f 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -11,10 +11,10 @@ package buildcraft.transport.pipes; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; -import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index 0808df28..450051ba 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -2,7 +2,7 @@ package buildcraft.transport.pipes; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; -import buildcraft.core.IIconProvider; +import buildcraft.api.core.IIconProvider; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportStructure; diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeWorldRenderer.java index 4361c90e..0da895bd 100644 --- a/common/buildcraft/transport/render/PipeWorldRenderer.java +++ b/common/buildcraft/transport/render/PipeWorldRenderer.java @@ -6,9 +6,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; +import buildcraft.api.core.IIconProvider; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe.WireColor; -import buildcraft.core.IIconProvider; import buildcraft.core.utils.Utils; import buildcraft.transport.IPipeRenderState; import buildcraft.transport.PipeIconProvider; diff --git a/common/buildcraft/transport/triggers/ActionEnergyPulser.java b/common/buildcraft/transport/triggers/ActionEnergyPulser.java index 870b1e1b..5b8aca85 100644 --- a/common/buildcraft/transport/triggers/ActionEnergyPulser.java +++ b/common/buildcraft/transport/triggers/ActionEnergyPulser.java @@ -4,11 +4,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; import buildcraft.BuildCraftTransport; -import buildcraft.api.gates.Action; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconItemConstants; +import buildcraft.core.triggers.ActionTriggerIconProvider; +import buildcraft.core.triggers.BCAction; -public class ActionEnergyPulser extends Action { +public class ActionEnergyPulser extends BCAction { public ActionEnergyPulser(int id) { super(id); @@ -17,7 +17,7 @@ public class ActionEnergyPulser extends Action { @Override @SideOnly(Side.CLIENT) public Icon getTexture() { - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_Machine_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_Machine_Active); } @Override diff --git a/common/buildcraft/transport/triggers/ActionSignalOutput.java b/common/buildcraft/transport/triggers/ActionSignalOutput.java index 2febaf54..8fb7feeb 100644 --- a/common/buildcraft/transport/triggers/ActionSignalOutput.java +++ b/common/buildcraft/transport/triggers/ActionSignalOutput.java @@ -13,12 +13,12 @@ import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftTransport; -import buildcraft.api.gates.Action; import buildcraft.api.transport.IPipe; import buildcraft.core.DefaultProps; -import buildcraft.transport.IconItemConstants; +import buildcraft.core.triggers.ActionTriggerIconProvider; +import buildcraft.core.triggers.BCAction; -public class ActionSignalOutput extends Action { +public class ActionSignalOutput extends BCAction { public IPipe.WireColor color; @@ -49,13 +49,13 @@ public class ActionSignalOutput extends Action { public Icon getTexture() { switch (color) { case Red: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active); case Blue: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active); case Green: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active); case Yellow: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active); } return null; diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index 1bd4858e..fc562626 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -18,17 +18,17 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; +import buildcraft.core.triggers.ActionTriggerIconProvider; +import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.EntityData; import buildcraft.transport.ITriggerPipe; -import buildcraft.transport.IconItemConstants; import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.PipeTransportPower; -public class TriggerPipeContents extends Trigger implements ITriggerPipe { +public class TriggerPipeContents extends BCTrigger implements ITriggerPipe { public enum Kind { Empty, ContainsItems, ContainsLiquids, ContainsEnergy @@ -133,13 +133,13 @@ public class TriggerPipeContents extends Trigger implements ITriggerPipe { public Icon getTextureIcon() { switch (kind) { case Empty: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_Empty]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeContents_Empty); case ContainsItems: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsItems]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems); case ContainsLiquids: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsLiquid]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid); case ContainsEnergy: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeContents_ContainsEnergy]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy); } return null; } diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java index 7a167b30..515cabfe 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -14,14 +14,14 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.api.transport.IPipe; import buildcraft.core.DefaultProps; +import buildcraft.core.triggers.ActionTriggerIconProvider; +import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.ITriggerPipe; -import buildcraft.transport.IconItemConstants; import buildcraft.transport.Pipe; -public class TriggerPipeSignal extends Trigger implements ITriggerPipe { +public class TriggerPipeSignal extends BCTrigger implements ITriggerPipe { boolean active; IPipe.WireColor color; @@ -81,24 +81,24 @@ public class TriggerPipeSignal extends Trigger implements ITriggerPipe { if (active) { switch (color) { case Red: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active); case Blue: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active); case Green: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active); case Yellow: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active); } } else { switch (color) { case Red: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Red_Inactive]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive); case Blue: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Blue_Inactive]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive); case Green: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Green_Inactive]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive); case Yellow: - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_PipeSignal_Yellow_Inactive]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive); } } diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java index 399af203..56352739 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -14,13 +14,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.api.gates.Trigger; import buildcraft.core.DefaultProps; +import buildcraft.core.triggers.ActionTriggerIconProvider; +import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.ITriggerPipe; -import buildcraft.transport.IconItemConstants; import buildcraft.transport.Pipe; -public class TriggerRedstoneInput extends Trigger implements ITriggerPipe { +public class TriggerRedstoneInput extends BCTrigger implements ITriggerPipe { boolean active; @@ -50,8 +50,8 @@ public class TriggerRedstoneInput extends Trigger implements ITriggerPipe { @SideOnly(Side.CLIENT) public Icon getTextureIcon() { if (active) - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Active]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_RedstoneInput_Active); else - return BuildCraftTransport.instance.itemIcons[IconItemConstants.Trigger_RedstoneInput_Inactive]; + return getIconProvider().getIcon(ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive); } } From 7672b7fc24bde58c586e0344aee9100648a284a5 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 16 Mar 2013 18:48:48 +0100 Subject: [PATCH 19/93] Underp --- common/buildcraft/energy/gui/GuiEngine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index 14ee284f..aa2a0929 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -33,8 +33,8 @@ public abstract class GuiEngine extends GuiBuildCraft { drawBackground(x, y); // Draw icon - //drawIcon(DefaultProps.TEXTURE_ICONS, 0, x + 3, y + 4); - drawIcon(BuildCraftTransport.instance.wireIconProvider.getIcon(0), x + 3, y + 4); + drawIcon(DefaultProps.TEXTURE_ICONS, 0, x + 3, y + 4); + //drawIcon(BuildCraftTransport.instance.wireIconProvider.getIcon(0), x + 3, y + 4); if (!isFullyOpened()) return; From e784f614d316f6e8f4e650c4a052634ae555f205 Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Mon, 18 Mar 2013 11:05:45 +1300 Subject: [PATCH 20/93] Update BuildCraftCore.java Put config.hasChanged() on config.save() to fall in line with lex's merge on Forge. --- common/buildcraft/BuildCraftCore.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 4d9a8e59..9f19a24b 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -253,7 +253,9 @@ public class BuildCraftCore { diamondGearItem = (new ItemBuildCraft(diamondGearId.getInt())).setUnlocalizedName("diamondGearItem"); LanguageRegistry.addName(diamondGearItem, "Diamond Gear"); } finally { - mainConfiguration.save(); + if (mainConfiguration.hasChanged()) { + mainConfiguration.save(); + } } } From 6dea7dfaff9b2be7052c4fdd51d9d28adcaada39 Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Mon, 18 Mar 2013 11:56:01 +1300 Subject: [PATCH 21/93] Update BlockOilFlowing.java Updated to use 1.5 texture system for liquid. Checked that it will compile but untested code. The 2 methods works for my own liquid in test environment. Do not merge if you have already updated the oil so that it textures. Still needs the actual texture/animation files --- common/buildcraft/energy/BlockOilFlowing.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index 11f29ae4..839921ae 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -11,9 +11,14 @@ package buildcraft.energy; import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; import buildcraft.BuildCraftCore; @@ -25,6 +30,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { int numAdjacentSources = 0; boolean isOptimalFlowDirection[] = new boolean[4]; int flowCost[] = new int[4]; + private Icon[] field_94425_a; public BlockOilFlowing(int i, Material material) { super(i, material); @@ -258,5 +264,17 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { public boolean isBlockReplaceable(World world, int i, int j, int k) { return true; } + + @Override + @SideOnly(Side.CLIENT) + public void func_94332_a(IconRegister iconRegister){ + this.field_94425_a = new Icon[] {iconRegister.func_94245_a("buildcraft:oil"), iconRegister.func_94245_a("buildcraft:oil_flow")}; + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { + return par1 != 0 && par1 != 1 ? this.field_94425_a[1] : this.field_94425_a[0]; + } } From 42a981e0354a173db2cfa4026c1ee6a782393bb2 Mon Sep 17 00:00:00 2001 From: Tarzan Date: Mon, 18 Mar 2013 12:05:25 +1300 Subject: [PATCH 22/93] Oil textures --- .../mods/buildcraft/textures/blocks/oil.png | Bin 0 -> 14567 bytes .../mods/buildcraft/textures/blocks/oil.txt | 32 ++++++++++++++++++ .../buildcraft/textures/blocks/oil_flow.png | Bin 0 -> 10198 bytes .../buildcraft/textures/blocks/oil_flow.txt | 0 4 files changed, 32 insertions(+) create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/oil.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.png create mode 100644 buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.txt diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil.png b/buildcraft_resources/mods/buildcraft/textures/blocks/oil.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e90b07308c58daeab5432659e9ac45095204fc GIT binary patch literal 14567 zcmV(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRafZAnByRCwBSz3G}H$E_@AaEHf|Sy@{*DN#Dh=+3;tJjXopJjL95=bLjR9dYZf zt|cqCSbV|!06a2^)U6+6vze6{8R2dK3}$fpKmV`O|2IFXo=ulkG@`68gPaH1QdpTN)kb?ztG-bR}xZ=m;pF)aL$9B z2hA4@+|FI5@a8>Zd}#COd~vW=w3~-2(s$QV|sL zaG}Gl*cE^Pzr`*NxJX8njFjxExw*k@j!06FL2wWhDL@=>CW3bi2LSPc3xK@&gzudv zPabaE%buGpcH8gh^ZA=RjRzb{!~_DG4Yp~*2tg5h!~k%4!LwuWVS^1hIBvGIna{XL z0enEy-_t|8!*)E#(H`UMJRE@5F`V;g(u^?;7@HgH`1P;ySLja$faxHw$6o=6{Vf4R z@FL5-I+KT!f|4c->=+KBkEH&P(-#2x{mB8I(K-gF2@?eHE!vV0SqcgS8Gr|nMd0n1 z0U+8EUsfa$JUO^LVIT*`QuHtF34lm1+rEMa*_+$msC!04U&AhdB_jbS4YNzo=CrD{bc~leJBJVPl)7nb2S@mw%^g`l2LB|j6c8sC_lylBLtCs zgEsWorU?^(5;oZO_jF$}%H>(U<%l_s7!SY5mpo&Tf&zl`j8K5U%@(`)g0ro_Jig&| zc#-D?4+2^#C^=&w2k%?-p+mp@o<27lbbNWiv-5BzqYxpJNANBBde=+DWOz_SFk!@H zK4O1)mM0NpT?b?j9PpA+a#4f=0gk~S_|T&f(aTQ*&Zz&J976pR5I_uWHrPr*$q};w zixZ&ufF_Q(kV63JCvr);dB}kQz%jyn!qM=+5upgd_JE(B+8H7MF7YO&W2Qj8Y<|JnL0+*x;rlL@B@u4`Lh;0XQGf0zew|d-socbb%V@ z5yri|Djs}KpU+S7G@WoR5feGMW{cZ6Vh~Z7w>?vaH@uP;*KDyP2ghMco9Tcf0C0=0 z{Y;;m8*Ilt4mnAbgailpfR;R5y^(3a+}vQx`@hS70`RsYF}}$&aNWvwgS`}FatKjy zAdesgQ=SzMf^A=Y6Wy+1g$Kn}Bs-5bN4-znqR$bLCF|Z7yMnr14TWO;yOIzyFc}^o zEqGu7h3NV)+XHoEU10AVUE54cd}yOB1{SiUw6dlnf>ZaA$aM#1RFB?2+>l zjSW~u??uTo2C}6cI&8ZKx+j9){eV9mev+ST2kRC123?7mL2%6$eS1rHQjjmt@{%Lw z9Fc|>c}+8B$%y0;xJ935%-q~y7cUq@P$VM`uQ*?x1@d5W@L_|U z6eM!ssQCc{NKD@FK(2TYI`jgRJYR2ciAcTyrwKC=0H+b1E11+Paf}cLoNe>erOYW} zN~6J0K+6rfIN-?3BeW=7W(;uP<_5bwV>Cp9WAu5#EE!XoahWDu0D!qepY?|6eGn8B zlsMqH#)CX#0D$fukG`eOHweRvymE7cUH?E2mlt`NFF2QkNFKhuQMi|)t5mXnrSTnm z@)DX2wjem>j@t1c@8p2cqwntMhtQ+DyvnQd;F6IDaJ~UM2Kxpfo^ehSre=$t-+z?9 z+s*P2U=;Kdg>j+@BWDI4?oMV^95%V6n4#m zN`(k$w%9c{bR!vgc$3#0kwlQ@vmDce`S>fMV+8ID54v02$3YW^Qjjk%c)C2x6Rw}m zC8Lx{ugC|q+@s%qrcd1+c6@opGkG}4x_upkokz$KlO)8HFai2liy&vg6fZapuex5C z92@{g-nMN*l7dp-kQ|sie51iO`36nA;Al^*unP!zUg3d*^9@>Za7z*{$Z5vt1G+Tg z0?pDg2##x*Hau|k4K3hg5Ih`QNl1CrT*9~Lxxr>WU-2N@Iw)mEfrD#qu+0&(l>zVp zZBCd_fIMPI15NawGTziju-%!IHy331v<7R`tyQe>0 zUgR~67z;2tkG9?6ZaU$ZXT9td9=wv5&}^{<;Mh0RjPLU11A_DL-97z@JG7S+ltGtOzm)NHZk(--+-TQ)<0iuWr#@Q&f~giBIfC@!FtgkhL5u@w|pB^kb! zbTt}7G-q~r1`-%^t34jc{<1;N6bWUk|CF8c{+c?lVgO?p-+YfyEtMh z6XsGdT}BKL(afwt>sj$2kD5z5M&K6R?vM0`c8ARs53Ex2jg@yJhB9L^$Sd}=a+xut z3r^#k79~thld75@*$Td$Sri)K3FotJ==F@fNh{9uP&nlLWh z3L{8HhM=Sohd5ZpVufe1g43ZOS$=Q^G{J5=Q{%7rvmZ zDts@72hPK@Z_($;R^s)?S?TX21FlgD0082M(LP-RQ5rCm)snSG79}G}LUIgm#d-1# z+Qu#Uh&`#_i4nGCJZH^ zC}$?h+_c#G22CkQ>7skaDLv5aexM)PTWtCAjIZRis33yl7F)+~alko^IH%EI&LF=i zr+69PeiG*qpw~R}LHO!iF~U zQ4VRw3IZXWuHb2+@k0Ch+}#hk%(cF?9TUuYP2vq;=7!0wj6{`xrT!~5M4t>4T zHMulUamHf6w+NxfRtj>SG3U6Xg>dnVb4i*XSQX+S$da|1cZ@&|oD-sN5FQi{wy>*Y zVle3qYn_AR9=*}P$Pu|DB;P1jj0fz;cRBjT3f37jZyxa&2TXCmF(;*Z>l5G(y$@(g zLQGorf;`|n`1a5A=VptJ&rf(F2E(YZpjW{28OM0RISLMd^2)~ZB9FL?d&2`4v>uQQ zF9k6T7>sDD>%+r=+YRnYK?)tV(+S5~tSf(@TwbVCK%Ox9fQCD?-5os;fiAD|YMd(IG&gLvwDkdDc$3%pjKMc(I1Yvf zmU&&iE&M@E^E@#SFF2-AMiFFg(Pm|S%0dTPrM^aDzu-aT-vto_q!EK-t?sz4FiF>X z!N`~ocp!o-xc+y}mLIr))^1XDgWUD8t&2N37$8f@Hq|`;()WvnC2OSh{l7k!Ok&Uj)-Z*xnxYvBRB`X z{WJX#w&?l%grAAg*6$R0?2J2opHFzN>%V4l1&C?DW!%d%NRzBhtq)5?j04Wruw1q` z99+}mP6Q=%Xy+5oHJ-3>LX%u;#AU%4a|;Mcyx>S4Ay1fbjpmN?guy7kP&q}(NS0hI zB-Ij`$nao?-F(*kz>(9%QnM7NU5=%{SVLMxsCdSCKH)(05f9+_TCLRnBKO$-77w_k zCTy`eeUY#18#K;glV^-Y--vySHgwp|nxUU7fC9j{$1}0Co$=5Npp=Z{0yu2Yx3_dF z85j@pRx@@GLenW8xCYJeDsOSn3WoE9WYt-bjCgte$S0ChLTWza7)KeQc+lsF**9n^ ztDDIoKr!J%h!;^x7^ESc2#AUYK3#C;N&(iMYVB}Bkjphz_$80f!aqyW)SrEe)}nE$ zT^^7nn_89RRY%aThzjpK9CL#vDg}Vr(XgrnlC97T2);p6Y=M=uRJzVhN9^l;SYjcJ zthc8?UTHCI(Lel!{+&CefFxh>KzoQD!3D4n2qhs~mICgnCji5nyuJNZ{^r7x9}J2I z7o6jWbBP#A1fn(Qnj74a1Eo=hG+@lhG8Tfn`#1VCcWC(hgfC>p6-XlzdARw6<8;7V zrG^$fm@%abu;d5ap(h55$_1wRtlM@~y?gTDc7q2gD9sIR$GyB&@|Vej(|~i$*6jvP zRPg{x&dq1MgW%#QM@z~h0B{<$mp~4lytanyv&)Lz@#HL9Rcf%|o%UuJwWDcNa3y0c zI-jK|9*8LH5y8bXj`In7B6ux%v?bsc_99`Ljv8dR$CdzBn-%RXcH9^qe3ftPSaGq2 zFza$}xkDcZ#e;QKJHBBembO8! zU12LW&sm!g#nwhu%0L!8K!$E{=1$A{+A40=+dNjdg-@a zNeD+C&NrIDm!xl0isER+gV%-KrUegtjZ6SMS#zIzv=4uwf8`ckjbOFpsm~2*FO$WSz^y}0PsbplXo5eB_u8DQ6 zB`v|My(j=Ej?sq=+B9O~3f+uG&=n7qpmA}~H8Ae6=Zfzi5{sG-*y?j0zT_3pkT7LfQ5H711;N#>E(8S*6>Po1 zU0QVmb4^0X!Leg-nlT$5Xb>q#@CykM99!vUiH6aI%C}BO?6WnYYhtl(6ED4%f)sl6 zkAI=RaDy#?A_>z6JOC*r!b$-a&tS*!%?;fGz~x!Kz5gUXI)(-$g5%96e6NtL3|5IK z^Q_N5bm&D;rlTCvgvrQB76;t_EB%{qu6W=oLEqgeh)gFOFE4mnHF2{DkjEOK3=f(c z?0kceBXS&YR;dh}q!qjG!QCw$OG57M=;87vFD55w7z8)IW537+u+#!oRtCvP;~uYy z9a0mJD1ylGqNOhpl&jEZ?rYC!AtwCwW;+MRTij>UCl-555k(h=YtS|u^poZX*$R*X z($}UDr#Rq51aQ^Vkk@`vp0znMM(ud{fYw<`CjxYLxc4pfp+j^2CeJLk<3zMUQ}Mtz z@M%U&1I}5lQEPa`vkTI8cen$=v1c^dzMNq~C(2lR$D}xA1th$Rcg6J{c}zLd9+ETWo~%G zD_i01{s|t`jRePbvnk`VPnD$psQg0drNP~Xe;Z?qY0B&#bz#ZB=W1i1AU!L() zIrd7zIEHI)aW5IUyQhcYRbKLp*|+FezZ;&gmWydWspbczM3mtb&*b2yqr5M80Km;B zyf5sf*IJRBF5#7O6jnpKTG2K)*lFY1R$I+f$pPFd5kH@CE~ZajDjHqVQyOt0GFh47 z0gR+R=ZGP{o7#aFJeWn04G&sw&|Y5Tg-y7rcX%|topyRSC!{oB$Vy5?0DgE?KC!#S z9XUAm4I0dgxEns8Gcnsm3g7}f1m1P%n;YzWpfDZfP&86|w)_W@FqMoFVc~wYGs%NX z(tZMwC>}(_u*I%sY3rZ7EF5cEEI~J8BGoKkoCjZ?@r6rTX_0=fkY18)Q_5zU5zD+} zFom02+!DdX0RwbB6cE@4^tOnu8LO@fXIJQ*M^I8WVqSP83-bjZ@SxtSXet<2lB!AF ze8R!-p!^08BCdOZ9m6#n>*^6c3s$9_EW&;)tO{#GH^kqag*ifG*ndTGDrzcfI89LScAar-wNdfu?y1Tr{TbeL&hn6A0`ANQtR$^IX zRVP@&St6#(3nub#-n1(mJE`@n5#xIM$UHQcR5uckI+U5yyI?DU; zi~MS(Zd&Rn57*!0bIC}XM|v3E zwiwID^)jpR$u^d+o|TdpF`KJqh>{VVM<`hxRkc!yA{vE!gO)q=@uKaLk`RsIC}K&6 zsp!GJ!8U8U%iN;1>MT}n$py4ci*3b&_Ez~*ZBeW=n3jBv*_etaiR)c$s=%1nA5Cn(S=W}_B-=2SR*G}YuPQ#HoSz{4wE0TfbE zd%yWapYtq3nlN2n@NAX?SL0_KEcMx&IaslmNcu?6rK7W%hD^ePD z5t&NJEuC?tg|cx=2|!L6k(ZWuHNSZ^J8_FP4mgXm{2(oPBGyZreL$OS?OWv@^VRTF zTtM4&*yagm5pcW1t#7CU0rOFgTugUpj*()kFIXctm4sN7?JH7Df8eEUw%GUvfkTfj zYDmu(RN6cv)u?QG-Aqb}HJ-sD+Ps3ODJ(e;&J&^(^>oR~HGpDbAJW8I8uZ$Sl4G-_ z-S6<=gYrWZfmiuKC<%!~W9Iq!BOX+t=f?)cmGv!B5cBkrf8_QS_m06v0WVM%HrNt@ zqm{ZKL{jy5UawH4L?@NpSH6r0i0Y_acRL*%;K&M4BQH76))w<%LXj`_Q2a8}#o#%1_f#_RfPHqZNXpJHE*wHW=g^zQqBPWAy-r4SFIt9^dc`z>x}>`~HC*(?npf1poNq-;LZr|E#hbd-}1@Em&D zp1#W095LrlqSZQ*Igh}O5o~p_4`@r)EnLNGE}-QOO`b5C{@~Uz z8Yw7o#87+h#biYTuFg6y1>RJ_v1&EPJ@(|`xWm>5unL!~v?0ZVKF^p-v^DR|Wu)w; zBL+JM*KFxV0O1@l`39UWm`VXk#D2Ldf^&i(qOl=oz!O}~DAQ3+VS}F2u;2lHg9nQ( z(JHkCk;%ao!F+ke`M3GOnnPIQ0oUmLyZoTJ#l2^Q`HX`VRt^rXy}>PPTUQG*DGj)Y zn#gN-KPN0MQivc@fuD}pFP^3=M!KciU-=tL&4)kOHBHLLJ+@A>(?kwzz4!M#U-7^# zc+jDhjN-id8ES#y1AKdj-TOb}m-!@T=fP6(puNQ%1e7LBRT`0tdU{&x^!pa=@P_v| zU~nF;2#OD2a$ufR?FXkii?)BD&+#HhDZuHQ;elmuODA}Z2mK=+yL-CN5ovmt_w%zn zEp`N4UDumO`XmBuKH+gb<21g@!Fe#ZJGwo8lb1YUOj`Ej)hBq1nU~X7iM~NQ?D6IU zn)({v|Cd_#S0$e}B|s>7(WiJ~xSSB3hmRNabKp{&_v>0Ypfx{ZBccjG)R?JwfDb|z z(_?0GYDE`|iI%}<&uCo$8y=w98da#O>co}@M2Pu!*G^j?=ZGmQJzk`sOb0|L=h*sy zhMOB~=aZ(g&VJF}eX1OztkAjIx7%B~L4k0ZF!=^ux!_n5irLcgVq33>kqBL2K7E1*fM!d4oeQVX1tIf+59t4BT0{EXs(m6f!G3(8`oemsr(sMQIW4 zv8}|l^`Upw-u}D%fIHk2D>STrY&M_hlk;$!&vO7Js`_<7gB`V>nX=I1fLcmmakO zBV-|`&j@UC2qrcXddWAG$>2`!cAk_!XtvmaKqi7$&$oy! z3iInJzidF0My+61c<{d1wp(=E-e5N!QHl|;&VzGW8WM}0yLNlXBX|b4JGvD>TpV%c z4x1Xv)1=GPDwVP*g-j*sJX}sl!(R4jl!4QLK{C$&6c2!0qp`USL#0V7)5i<_|J$hx z^c$mOL0O4{UCr*8H`tf~cC6pqnCv_9<}R=dro^RDpHejY}zp%$!DCj5;fIcz`pJ`)w_2t!dqDKGP=v*!_S{ zum34O&KDeQoj`jLHV`AHD;^k=$^8S}Pe(a~p8B`H;pce4;2EuGdjyWbJfHL(xkv9A zjpYXy062b;pCzLVuOAypwqsTJ+dty5y`{T6W1dfP8u#*QZsS;MMc<;|{gM8VC(PX= z9`lHC*vp;>;O%$x{rQ_b#Sv4wXm{^-`N4?c{YUu+_t;KH9BbJ_4A0;Gr~LQ2P}cQ= zYtWk}ZGy(bwkqc1pm-ofcOzF%igByK+_uqTBG;=hkLOgImgEt5WrTC&;mvjH%&uR! zK}SyKp@@LP2HRQ+=ZM5!3yvZgu|%YTg{|_Ek!_GdW%kN+zxq`}G}wdzc~$O=FHTy={26HFx$f78V9>^p3Hu*plxW;F~4ssxkt(mV|UwjDob|`MJ5F zO_~tnMK043=Vg?W%?IHY{q6_)Q<^buKH*b5<1*}J4?*GW_w@PlEU)o`Aztua^6&G5 zG-25PL;e!!Hej3DF&^;lJRHXh&hd=HGKu6j!xIb-axFg6V1=mu!|{i_@S}6WFJmmMAh%?r zngrB1?;C9Fj>lT&5~J-O@G11vjqkG0mW0&mrs4rDgLUGEsVtrfrt=eiAt#Hw&hS8O zTlJ|F6n7=nuvtM^HsuSNE$+M)qs}67OV_Wp#e6}HTsMH+41R|S-})c?EjUG|};?f&ohC5;%kLz@N^aVRc;IbLwAW(OgputlF| zH98!AmY*dfUW$CJgQpfe0D#dtp4`(mPco#86fYR8Rer7;jC8$h z)3BF)Nr-&&NBZINEZ@?IDGoXtXmJl!JQy*&{oU|D$3bNxkPm42+y9XNXN3p(e~AYk zZ5%QBpvvmnLS@ry16o)Fd&Xroc!{N`nOp=pkJqS0&L;EJN8$q7%D=jRrbHy}(279P zpan(v{Fz@bM!pK$h#4wkC2IqUjX z+eIyLTKl)Nh^2TCHt5F#_Qv4n->5(!*AXY#D>)PAlQ!|V8oYkTCDKY2W|}0c7be?a zYCrgpSgb~#*@jUU&9(TrHY>cYOm?iaPaP5gLa0o(&W_VAckMl{9GRLQhz8ZXl2F8w zP)=Xv7y7n%e5!Ho10G05a;7~9p+{fUaFzZ50nHA(Dl32(POK@>I>sqSL~cI}-SXU` z*?vdgOF_B$10G-hQ~ql@;ApQYL~!g|{p6BS7FlJ0cZ_E9nZ6tM^5#3M7e-9JLnk8& zLEFci)Q;$y8y!#JdnMrW-Vv$uv{rp6Ztw8m0(_pe28s!T(@8i4S!R`n8!}*&$mxwVzM?;)ru8X!E3_Pb6XDwZ6ihc`?gbTn4RJy#N4lUaUJF zbR{IOctAiYC{5Lox}HEoUT4Ee!W7Rq66p*{6y)iEJ%9oa z_KcRfM;k8~T%%}I%C-2Yrm)(uqeia~rj8+Noll`dKb>$W2?rW0L=PQE)=m3T4ZZ9j{a#>4E7jVfR@F0jFeiZjrO)4Yw z_jqXUXg9pdo8f^ozi(XV072ljPI*=A#PbuT%d%M)g2b}Mplho9vqNtggp zWUeC~)_h{9{)Jg@N}6y6bf;PI?YYJF{@>|e;~B%|Gak;*c$*HYmgSp2&>t=@@*>&d zpcP$MW#xIo@cLKz8@K4D6ONU8@(lvN{Z;_XySNDy4{q>SWoL1~z&@zG zAkP?<5f+TLQswh$X{R~>WqMaUAPtF*eTy!S7=2^fT*ZUD#6SZRo8s56=ujq7d*bYL zl->C^c<{kZP@U$+bjCEHIH%gYgSmv_T8C7Bsg6Ue{YIGg89>USpbFIP{)#&gEPr2Z zNQ;B0K5hVot5=l= zlZE+gnuI6?#g(kdL)d)41DJTJ_LYLD5LPX0N|(6>52|FKP9-6y_l6tv+wbWQ0HlAw z-Tv?LkLiT-GQ`^4g}ah4mweTt*dT?by`}rpdn1x9j&-UjlvG)I%_&dOmto9OTRG^!TBCNoX*S(TlA74 z+@Z}A=6KP9qq)H&x73M9nNK*fV=x>z>!_=9P3vvoPM!{U`wbqvP9%=Bnc>*1J2 z0QzdjtRmpGHq!^RFgBAkkJ4YZ1Zr6Hy7Eu(;3_5XfKDcGf>7}QOR{}+jV$TEsmG(e zQN;tKr~?=^($I$l!>?M&-c)0*&c=f1R7WB>cIt0k`&B#zw2clee;D@K#3Gx_R94f` z6%Podsvk{z1!PRab^ebd59d@69>{C`WKHejN=Al~aW|wqlCL%_#|w|_OGYfJ7Uhy{ zLkSAoya!kttQBX3i;nnfHlOJ`B2agS-Toi)(|p!}{zlY-n=N)Zsrto6c{r!8TW)S> zHy`C7f^vDrbGAn=fa9&sQseoAW1VoGX3XB0dvg_hsr}YE(7isjc(HncJM^y6h+AcJ zWc$Hvd+ZyucmG0viUa2E0k`L`@@>B0ED4Fb2YQ%}a$GX@qHQx9(whPJJfZCWAwRhQ zHyyCI!DGcSm``8imzvTL0i>MiBz4lSC7f1_d*NmJvx~z=JODJXPIX`a%5_Al2^n-) zwYh7w>|@(q1o#d;JRCAg*kUUgg?sAKC}Y$Pc<%2M4?w_lkazY0EwwtzVKLCFwB}eM z^7t;VYmT+zfeQ#CHcPZb%(Y&yd;odY;W0~l%pv$jD;!BkqP+;Ps3lZwiut4V;DZJs zW6JTGE7ow&b(XxSrWqfKZ3Ejy5h%;}+yotmmUv;NXyFeRscHGxHpM!tcMdIi6s`_| zWsZpRo?1w?i_zJCebpKO2pNPD;Zf|JfGyT8p#dO43$w z*x<&-6?h_e=M)cE2Q&NH#I085TGeu;!E(d|{W_u65I&&m@9CaAe0z(V_kYNbi{#Qq zU~$;uE=P=_c(6!^9IMEAI?1sV$nh(FT{Qkm7wovDmggg09V3Jdb~eGdsYgi+uXtK_ z8dq}!OFZEK60mQvaoXiMOGb(6wr@+)S;FK{e2eYfpXrBrz|ie*cl;_}@`$MvBpn&A z%_lEKSE3YLAn-!E4)Tce+keU59V1NdIOM3OW;h4t;T2yOzk>PQ4UI|#6;p}1QZS*p za_wotzzfBzFdaqXuy?`6B4Qc;7eVl5sLk~h2qsoCs-A%399RG}8}ub3bB8`pSn!~^ z!L6P{Kw;R+o_(Ve{o_T?Vkyw!D)U)G{P>Qym4XuE9|DEClwXIwOoe^m03fVWE@rlhOW$ALdmiW7f{`%=zygQeoG%z()CJx zpa?P*HH6jrI@^F|znp|&2}R`+t>?7VOo9*fg7eNWaW%bh>9e_j?dB6b4sY^WCp49W zXpa1B1xaGZa3$JgPGc@|M$QrGFvxOnhjV5gwk*}0w#DTc5kTgRb~;vg0B2_}Ku5w( zIvyQco9dW!cAzB`C8~@T?y7w9LFFRE;C74c;aB-Jo^cQ?f``K09Ujtz(F*E1b0GQ# zy>HN_L57?VFW>M*>a=SQ*KV=no?4#X@kV?dpy2|VYQdP^u@}+7{ZjLTIzRAec;Fh< z=;nwdH9x2`1j$ml4%?eQ(D!M;(A;2mdXgv8>J_&0XlApZ787wy^}j3q^Zt|kY&;b%ffoAIw&Kv9iefZAu88HO=`BX3~bHI;8wLHL?m9o#4MWTBGf6qSHti!dwF3v z3622-ckjWEP$MgPabR!C79_W4PcA>K~?Ej!C4 zQ1ms$Rbh&6wclu=-P;Fw4g#7j?a0H29_{H# zUPe8FXK7S$bBnuF$3BbkB-(5DKA?*iIp>UY{-y|2yPn;S?m~}_r@i8V?{vfu+tDFK z$NwFFS1;Ho%XpN-5*r<(wFwL*CY)_vQlaZ{3jNI==nrv_OXz8HewJ?~B9(%;%zh)- zbs;Q1`)qUSP1=am9ET5Kq$L(*e4*5@zSQB#r;osoBr(dG$f zHoZZydLia|3YN76>ddxEJXv$X)qXrXtrv9Cimrv_ARlWbw`s%>2aG7l?H%s)C?3Ou z&|?=i)Q@|4&k++8Oc^?PWtdNR$7(~FKGAU}ZOL|0*mRVm^Lj!~vq4Xucs^Z+$5hjt z4`9 zr`Zg>@eR)q?dUiLb7O|`dZyh8KA`Kg$!rtT{mBc89xYibrVs=a@}i?HHT{r6egiVG32Y}pe(N30ho^(vDiid`$`2SE4~*alrdPFPxLvC za^{x$ac@V>6l7jbIjK$jsz+08UaUjhPv7K=4`|XTQ=MMte63usU0!yYAH?Kq)k zXqp@PI)j_4vhA zv|ZtWBL&;*$!T>0d|8SP^>7qBpRJyDP~Whu_ySAsLA7EtJ2#ug!kc!z5SDg;Yqoft zRdbM?UuLK24b^d}(?ZIYygKa7Mx9MZ?3Zn=L#)~CDaqOe(G``FDSzlyDQb=SsssqN zD@p`xKGA2hXhq40Ox}i-TlyMWG~A-MX&ZyLRMg} zxX?*o3r`Gtc{71h*WA!&ZV}8irpGBccqk?Ad_a?D%sC-(hn_Dlc&(fO3gUc}_un|r zm;M6j;kflNrxG!-36|>F3Kc*W)6a66rneTMIgW_YqPosSjHz{Sr2u4%%?CUv$Vk`Z z6WYjMMmYG&UaErC4mR0hmnICgfoE8dWR;Mz3D~BRS3MPb!7}k)^Tw@XxHRHoV&9B{ z;%WoRrV4oliJUM|rO&r8&0mTox;D%N^SOksiVZ8y?>9R*xTso@?AX z>!GYiV4C?OW#AGo@PiKaxARQ40 z=pnYlU$i4ytfio;uqx`a7GO3S$l2~=8;v*KIJ2^IUJR-8|64`9)sllNkjI zVhCtb)GoidOD700yy2M~IBaA~fMXx184q%V=s=zJhCXqRem=_4veN_y=bfFl9l$vv z(WPM0#hPS7Z?JVF3568>go2vfPg2q*C_Hsz5yPm);#kyc}#e;

    |NJRJB2jmbz# z)D!9#6^QP8TL+Henk^nm*0XHa>IWC#1RJR*O#3 zaL*qoah*PrH2SKeWNC#5Y~!d$Z%RhW*1+b_V_RyI&cT`U&F84=!>K*Hq!A+lzI(vE z3)GMUjqh^cW~*A0^OJlXk2s1A3#jLC)q>ON=rX(^l9v#AbVPc-^L9GwoM|7>GO=q%fr<9n>2`NpOn+;O6s_Jk|4^*Y(2xKLB$&!Rh$s RLHPgx002ovPDHLkV1n%S)6xI{ literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt b/buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt new file mode 100644 index 00000000..d8fe765a --- /dev/null +++ b/buildcraft_resources/mods/buildcraft/textures/blocks/oil.txt @@ -0,0 +1,32 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +20*2 +21*2 +22*2 +23*2 +24*2 +25*2 +26*2 +27*2 +28*2 +29*2 +30*2 +31*2 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.png b/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.png new file mode 100644 index 0000000000000000000000000000000000000000..e72280c42cf4d21e80c1e1733fda94d4217beedd GIT binary patch literal 10198 zcmYjXby$;a-)0~k0}(+%Cn6;wons&+Ez%7lA&umK(LF*$rI|EJhcwb5IT~pg%_Qf9 zDd0DJpZEFRKR7Pfb{xC8uk${CXI!z`T2H7cZc`8t5KybCDC*$Xdjtg62*^nAzlEfm zj^h_{cNJq#0s>0MFNxlkkVYwY1Q@1gd8iB?B5eB2DMLfw*MUir%^el% ze>GHmHwk(z^-nt;vgTVE;Tj;ektGCRl`S|qcfR%R&`y|4a13srF8KP1hG2vuj+C%~ z;tMV!f130@0Yw4b3m$~##i*X;J&8Zr6FyHp^9Dp#_OYQw0a8H(uPfJXrKC>yCy0gr z`oQG&s^D5$FzW0zRmZ;U(GlQ$&FKs#Tt=JFQrD~y&8z{?jy%|^26WTu@*qZXhA3~E zVt`YW10$TxnDCAh;}Y_oDWm`}m>$v3MuUDUQ~FC_hUfhzw;hEb-=@CiN%|gzL$5u= z{Y1!^+LA?)9q887w2UI6J_C@%qz)~axI%h(a%!hbjdAH%V*GvfQ-rU@O3(5#rk5a) zatM=77#9G;_`{g(X0E13L{u>+FMnp}^%1@x;hvRLHalVDgNjAADHY4%NQ5E_=-9lZ z-KjWV??c6goPO{S3$yO-VH)gOw!(CK|Ckl_q?LK7R(9!?mmkiL>e zOrIp^M8PqHB+F{{&AH?hV^#Lj>wHB9VBN)X`!cbV(cPQTBF{y_X>drm_Sg#^h;W{* zbhtm0pWI1ye1@}cHO?4x7cjS>8$6-Yg;{HwJc;S15&^$aL^W;a1mIs?R5E?qIfbb%oub=5p;1A5$Id{ zeXnuLyA^!w9@=RmTf9kpLJbb2L{1);Ar=g3^AVM`lvLeqh(}L-9DChh9VI23Wmr=z z?2;H+es+bD9oXvAPSWr5u+_7LlTfGMq!n5!&2r;^;UzyouFClU4=_R{My{Y2q4E`c z+Bts_cZIR`JD{AyEu!HAK;9QXENOwrgkI}Co_Dv(D9Gb07G@J04*M7>qYQ=~xH|j4;c#q4dk`)sMcGgekIzD_T(g;L!(*Vd8x?2#VE6VwTS`w{`37RxOT*P0##Ik_7q7W)^g3Py9Vd=V;FepDKeZxi{z zbe!Ut*VB{udvsT&K}^H0jhGs0KRa5xX#dc zm?^4^k*hLt{l%J=iWKWEVQ(EV+{-024-@(inPmgLAY-_WKGKODg-x{QwRg0?F@I|L zQVp6E=Gexf?1fjCha9~@`E5_DHbR|&vWqsC@aQoWtKGH}U4f=0X6oWUZN-;KN zH31?h<0V(a)Mqr6(S*^Yi<-VT5@uHceSSZ`Gv8nMJ?2Q)R&>;H(Wc)n3!fInTDE3V_-n87(BsTD=f;i@shW=Idu&3aA`=?{}x zx6!Y+`O@IKu!PW#5Vap=sU$|q9dKVae!gi-%y&ztl1wSfMS|V*h(!?6i;WU0+&D_V zt09yt!I{+!SU<5THUK~I(XRIBT=$=v=J$4p2tL7j}3 z4&fCkU;lai|XR>FBPrC33srti$(ea-IhM*4p-#X>dCVJ?w2aMb^CmzT74X=KVWL ze?UNIY#YFHctlTyrpo949fVh`g@+eT?jMw0p$diUCygS~d`ED<;kkC~PZgnUZF)kT zrC;G8irhdy9)#1|HObsD+b3LVMDfRBsdMH($0DIWCnOmrtk_kFCOMlQ*(nVaGC=CO zx@O__lg_*%P|J+Lh-Bp|{;{=?ftiGt8mC@m7h#O6z)<_ATJHqzDkXk(cQ2*{bSpkl z;JDGF|K~o>K-@}P@r02Q!+odab>dWBw_b`LXG8~mEi7h2EUiw_(hoqF*+H(owIdwO za+*91nfeP4m&!4=bjMhjV=oX5m*h)>$_WjT>V#YS6xAAN3e65rSVY8KMl&pSl$0dqoId5$KW?*f)flQL;@;MAi+fp_n zk=xQ}GNYe3Yq#lJgxjN9nLg>%_J)Y6s=T{glX10`H@@L*} zrzk&Z*X_mT^L;zVPZVf{v~%_s1d*)9=qfTEc( zS~7UM^K1qV%IP?X(Dm9VO;y86pX$pzVaQmDu{Y1%#)9Sf^OIxM1%hPagiS0w&R z*i@hLV49F_*$2BH^<`#l-_XMax z_~M`Mxds_4*JGb=keBgzfl(i)Z>_*i;&WT+%8$=1zzQdMbaRil5>+^FsI}GsRN0gV zXLX0h4v$a1Kxe$;eB)Ukj7AU=vOv~d!8YCVtA1>6grR?)Ud?l%g);R-SE{!U38>y~ zQ|&qxXFY+aWhCJ*vdwCSIGH5AyV?k&XCc5SzgBu1;LzCFIGPrl1eJ5_JtQX&%+yYM zoJQ?-J(==|B?84;LaMLyHbZ;raxEjt48B4ZyZrBst zf0^qhczfEBQ|NXC*s^L0Q;TyYbm#@v|5E29_jVZVjcE1P$AVqOP~Y#k^&XzdeW}&A zlvk?aeTMX;8~?bC9zp=k!h$n_-%{$^O1J%79${gAU5oJGRA5A305|B2>+;uS=t@Y^ zSRHxn#d5^P&-sXmOC3UDyioI!pZH&oa0NyDJpGSjXv~v)lW(TRL43?1L>nG^9?(`r zyN#`2KzcjMU(_`u#O>yd7j_!Nl+TIQkLr{4MV`$@^dQwrf4Yy!70v!eYM1jA!9-!7eL`NLHH@>5C(i4VpGGJ$_Jh4 zjV=~qiDnm;F9#12I}D7Jv~YX^4ep~Fbmp82W8FHN)e`x%bQ`IBf+Gvg*j94?WH2h)MHK7VC>p_Af5qitW8 zcp8};529b;ZiZ0u52+XY2~7IPuEVJwstNe^@y-4{{**iEIeRPKzfafM4s1qc7vS6G zarp zrA@tSkC1bdAEUZ%^%@OMA@$BPwjd+M;WjH3)j?JPx(TTIll$t=q_`{UDlc|P@YFjr zprzA^a}r+K7MKmj7L`VI_fndfdo^77=Z<{p}|^Y#`AqSqViFi>9GsU z%3*^@{U6vet`c?E;X*DR!a7>1p>#~(^JWvpK|qxSgWOByd+yM}Bv791hZ`SqWy;TJz4V6XH12 zDdBmSEUtO%Bgl6a$`mifS4ts5A*qD+N`S3ST;wyf^Yp*(dNVg{EvfXRq5j!3wb!qI z%#9+?3BjrGLWca~nkN1i~q{4STlV}VfOkk-;Unz5b5Sc9EgSchmEb-?DtrD$tSiS{*!y^~(ZLc^umnC`dAHCuvG5X5-2^M9RG<@q*!qZbk|$NSabhP?ao@rub2^n z&vW^;HxxMzc|?AXWG4Am-50h~!$l9Yt3vis{6IrZO2qafs95;zd(#JP%Z}&fnC0oPCH(k`W2tggjn~0Z2K;N95yGDQ1? zd-IUEC+X4CmtC0i2>ZLOzpb6~&9v-Sb_H0cu`Eu#q_>ZGF+O+D{+G){q~Ggd^ zd}p0K`M*Xhp5e?FUS+#xABR@1?VCc2@Bl+PHA4sO(u_ofbD#rQ{H?x;u$;#1hlcN1 zTi2h)EhK-M{=v;zS%<=X@#p7JygA%_z>@(>0>W;r{8tRPd*fZmpAJ&;*h`;?jTeOB z-k~TrHtn4{VhX(8qfh=%x`H>umyUmxp~^qD_==NZZ-Eiml4b3TCzt7ZzJh?^x!CNY z@3(S4dQju1hhRT!TJrREY?tV=^+QVawB*)sHiED4CI;DI%dDgba^l~OQEMD61zZhL zdMKIPwDufwB<2w`QJw)acW6_=NDG}!XbH~m|F(aXtw+nTj+I;E%)##^%j`3?P9wHP z?3fXn_Z+;0=Y#6z$teqmE0Xl9G)~*j#ZZzRJ{9ge91<#Z-=HzE*XUe&g&m&*0`A&V zJR3Urcyb|`Iwzt}Gfx6$K1tr;v(P3ri~LjjlWfo$GrBh(^O}yb;Lnon(MKh;C%pKqZ{<&Xe`AzR9WhU=+BZ~dS||8k z;3e>v1gID)5@*!M9}2kq!ZC z4c#D7HjVEbO$c-x$SU+R$`{DH=YQZP*NW?S+=G^6fVc}HT)b;O+P^kMg%bUA8_Rf_ z+l7aw!bQh(PX3o#GjN)q!x@YLtlH#TX+mMlMpnp@!beG2cZqGHRMg5Ak^V<~Ol;QP zOWH>C575lwfH%&kFNkLEKbTPaHzWQpz;IZy0k^MLL2}0>3+z8B@jspeLW^CDQ{paG zRMBf%haDEzGo-*|n2&kU23oeuI-Z2zJ!K~7(?|<4Nf$GL&v_6obDD2(=NAO84^&z- z-o&_TtMCLFSsa-$jU;zdmi8#|%cwbvQBnBasf9 z;r*@zljCD}f2pBxOy|2+R-L*I7SQfv#u!qI90u91afcSjU$2y-Y|{I=MwyOtM+-jF zA&Y1c9yUWwm~vhlbl8)?598tk`nj2AcKIWmv6hb+i_bonBNMZGzo^lcFIOk<<;OC9bPtvDuOXrf;uq*wrEi@3D{_McB?eA1s%o8MGwiw8PNY_FJ=k( zL*nkMn1t>*+NkSd?`NzKkM?xcOpgosSYAy(K*AMt94$aoJhwOJIpi$jxAF2*VYBQv z?M?bTSKT<$2e*@g&Opq$cwJGzMfcmpHS;*@iSLNvlw)J(NA)$p1pE*m<^wF+ti%?? zzsCC?FvCXzvcjoB8s~wJiA|0b{8mGJ_nP)W5^3@_1I*8aV}_S?e#pautOWIw=b6RF z4?@EUhMbG9z(usD74P-apTt7eT|0E}oCMTJ`$r5Ef`--vGXWmv&Ytv17cs8k!8QI~ zA0N`BduEPR?KYrHaUD~GoF=%A;!#paj3vGq+cCciRq%`!dF3DesUY&@LY*jYU{-W; z#_;QZ&F#NoaWLgoa@1Z!{kQpbd}*4~_CECC zI@oc%eVoR}^lG~SCAsyW7<{|BI~Ooeny&bURURc+x&N@~kt%*xL_V-=@D}_;uBcHx zFWwg~vixGu6Wl=Q*!hH+j;WQASYM3gkFcix^J+dPmAcP#O-x917<ai%8-lcMbij6 zitzf)CUft61$~*Ft78eGeuN&R z&YtX(owC#W)gAA)2!}e9G^kMwWQ5=6&zR8Xl556{?YUJh#S*gaDjGp9rT!M9ml1R2 z^Ni~&fp}_b+VTamcm#JvMpepIopB+)0CAZ>mcdjV1}5SZ#sEaUN(TpQjR=ZvdcFA+ z|5va%;Cn&aUX@sF>$8>g6QiA@_qWbnTRu>+`=2*#E0H z{JZb>DbNn+KDmR7dxw&=cl;hkXO%sAA8;UlmEOfK=9n|n@{G89F*(eO4u1;5!*0>7 zZh%TZuPageCBkR7&sRFpsS^VozQZ#4`BnIQgmd$U^>;}J!9^cXTKFh<(>0DolGT>E zcR4?A*-M+_ZnJz<3RNBlxKtjWPiAYk(ryw>ckiU|4)n1VtZ~?Dq(`snpWyj1G#k#)(<(+~~Jo_=&@RM#`mH`6fgBxW1Y zb+(?t@^8C~@KSu1oVLjQ0o|%U)k24S-pe@{aG^5hNx|1bt5=$p>=#pP0NW;N7X=vw zYeK9Tk3!c1a2>OIO_z6Ja?+r)FSw4JN14Pe^?Scl)S-%SLlG(*Bqn?8#JSku{4zB1 z%gx)Us87h3GIOy}`y&}Q!G;M!mWPM=h*=;DL0PdGGC$ppGDyNu*g^@%T@|ouwSa#9 z)8Kr?_iBWGo5kcs(Wtlww8c$M#Jhdk7J4DsJ?Xoix##EKOL`V?JbMcKo6^Z<$O&4S zUiJ9@T7=6Vu#Sqq56It=_CHqjck;4a_^+YIAjwa@f4*o#uJ&1R<>Zm6d8I+q#ryH1>;Jd!xUI z0blF+S%1DT=1s?nOq83dQzE>*XPx#_iubpp!o~Yf3Y zyH&sTV;%i9Pw|SL)VTU6Y4*F3;zQRDQJ=}FT*qIS4oN*KhemCT$-jNrTpYx?fkks)bje&(%k8+e>MQ{*Bt_g&8&k!Gah?IQ5@aXC&$j0o02iOdLgYCpt6mb@FvUt$f-W{*DEj_R?+r!V`Wf z+QyA8FAIY7m=aqIjW(>dz zp82KbX3+s()R1)FKk0uaiO<8I#}NIBH=y0Dljz3BA>U(YE%BIc;X(@K_=7LM@eH^POK1|BTmE_^S1 z`$SWZ#x>KsodNlVPLEz~o-8uHLE=b-eu@FfM{~VDcuau@Vv0_2>5eI3GrcV^E$K1- zUU1R#?`e-rdD~aM-_!9TdEy<-f+oG&v#EuB1287U+1dOQF?JTZ@WlUfpsBz#!=OTa zSObcbsS5I9F4APWG<{>jm@dJE@6=%?Y#TbACw6}(<$RH8nlC-m*gPbwVhX-;*1?=G zmWRNX=pVG$k39V9w+&$QAfpfSXC1$$zLFNa0jm5bM8h}Ypl~38RKSt9iqu16_jv!i zhY7cEL#o`&Gqap{ontpDyjD(1^9+e5rAZI@W_BjWhHvRB4XPT@P34*R0vaT7cKVqi z7_YEspDnXXKR#`C)8qmh*K%2~7uN%VsYB)emQ{a!f WQVtXyOu?VYBT!Y+Qml}-3j04On!Z{9 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.txt b/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.txt new file mode 100644 index 00000000..e69de29b From 0f6b311ffa3fd2638a290a9aec2679d2081dc828 Mon Sep 17 00:00:00 2001 From: Tarzan Date: Mon, 18 Mar 2013 21:34:34 +1300 Subject: [PATCH 23/93] Updated to oil textures that Sparkst3r supplied --- .../mods/buildcraft/textures/blocks/oil.png | Bin 14567 -> 4106 bytes .../buildcraft/textures/blocks/oil_flow.png | Bin 10198 -> 4980 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil.png b/buildcraft_resources/mods/buildcraft/textures/blocks/oil.png index c7e90b07308c58daeab5432659e9ac45095204fc..6eacbd51957eb2925283ab392b20e756764a51bf 100644 GIT binary patch delta 4063 zcmV<54f59&ghTmgWD z0l;*TI7e|ZE3OddDgXd@nX){&BsoQaTL>+22Uk}v9w^R9 z7b_GtVFF>AKrX_0nHe&HG!NkO%m4tOkrff(gY*4(&VLTB&dxTDwhmt{>c0m6B4T3W z{^ifBa6kY6;dFk{{wy!E8h|?nfNlPwCGG@hUJIag_lst-4?wj5py}FI^KkfnJUm6A zkh$5}<>chpO2k52Vaiv1{%68pz*qfj`F=e7_x0eu;v|7GU4cgg_~63K^h~83&yop* zV%+ABM}Pdc3;+Bb(;~!4V!2o<6ys46agIcqjPo+3B8fthDa9qy|77CdEc*jK-!%ZR zYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S1Au6Q;m>#f??3%Vpd|o+W=WE9003S@ zBra6Svp>fO002awfhw>;8}z{#EWidF!3EsG3xE7zHiSYX#KJ-lLJDMn9CBbOtb#%) zhRv`YDqt_vKpix|QD}yfa1JiQRk#j4a1Z)n2%fLC6RbVIkUx0b+_+BaR3c znT7Zv!AJxWizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifqlp|(=5QHQ7#Gr)$3XMd?XsE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*S zAPZv|vv@2aYYnT0b%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5c zP6_8IrP_yNQcbz0DW*G2J50yT%*~?B)|oY%Ju%lZ z=bPu7*PGwBU|M)uEVih&xMfMQuC{HqePL%}7iYJ{uEXw=y_0>qeSeMpJqHbk*$%56 zS{;6Kv~mM9! zg3B(KJ}#RZ#@)!hR=4N)wtYw9={>5&Kw=W)*2gz%*kgNq+ zEef_mrsz~!DAy_nvS(#iX1~pe$~l&+o-57m%(KedkbgIv@1Ote62cPUlD4IWOIIx& zSmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGAUct(O!LkCy1 z<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}TincS4LsjI}fWY1>O zX6feMEq|U{4wkBy=9dm`4cXeX4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC- zq*U}&`cyXV(%rRT*Z6MH?i+i&_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-N zmiuj8txj!m?Z*Ss1N{dh4z}01)YTo*JycSU)_*JOM-ImyzW$x>cP$Mz4ONYt#^NJz zM0w=t_X*$k9t}F$c8q(h;Rn+nb{%IOFKR-X@|s4QQ=0o*Vq3aT%s$c9>fU<%N829{ zoHRUHc}nwC$!Xf@g42^{^3RN&m7RTlF8SPG+oHC6=VQ*_Y7cMkx)5~X(nbG^=R3SR z&VO9;xODQe+vO8ixL2C5I$v$-bm~0*lhaSfyPUh4uDM)mx$b(swR>jw=^LIm&fWCA zdGQwi*43UlJ>9+YdT;l|_x0Zv-F|W>{m#p~*>@-It-MdXU-UrjLD@syht)q@{@mE_ z+<$7occAmp+(-8Yg@e!jk@b%cLj{kSkAKUC4TkHUI6gT!;y-fz>HMcd&t%Ugo)`Y2 z{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P`?ZJ24cOCDe z-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy001CkNK#Dz0D2_=0Dyx40Fg)> ze+4y3L_t(|+U%WCn(H74M$vH{v;S4bdAOgs){6XKnwXS6cB-QyM?lo@`}>=7&ZPN- z5GaH|L_|qjn20FnOr>0;$xq~(h<+crCZgX@cOhvD)ZNHAQw$+cjFIj4NCHIkuY&pu zw8ES-g%Buh+cx|UQYD|62kTbQ8`z}Pf4&d`)dQc(mu2M3k85d+B$L{CfQYgDlMuqH zJkUrXYMXu|9&qaX#)GzRr9!C%I}h4{ktR|*>6{0O3QFNtLWxt=RvI-MzL^JWRAaW~?WFM3k%-aXj%HuqcrJ~|N&m@F+(27sR18#wVdBFYMdGHt>yv#%k58Q7w zIvgSodZJYEfHN$5JRoBB8|y+Qe;$k`lk=eCFN}Vu@)t%%Cd328>2w~P&4ZQ&W*&_E z1?Pdl17!1lSOGT<&I9KG%mZ#V!aP9Z2VEYFtPzL@T*20oH3wmw2LcbK`~^!qF@!Lu zOy9aeaR?9UIbz~L&iP;-NM?-415Fp42f!FeJb24LnBl>+GC2gOO@a z@!)M?K?-qJY|`@JJTao#!`Jd)xH?NbFb!gxJ?lKUf(JQg+O|!{18z}e^O1V0%>^iO z&i}X0Q6AJ=r~ArewGVR66s=pPhw&g;crc|4^+0!*ca7l*%|!PXR^)-&J{a);whu-t zl=I+rJm_^TSz53l4^WY@e-+G3rucCw^mqWr6GyoT$MT@oaT5>P({;`R9S^R{0$I#o za2|Y!2crnyx9|Y{OrKwvU!ARbu*X!bgLnfTaOuTeF>23sEy#mW+(=SuhzG+#ta*T} zi7lm4dk9>^gAf8mr0`mvYdb@o2l>NcVVDORGw(Vc6rJhrGf9_+f0RIEmj|5T@KGMT z85qbhZH@=&%XvUVb36zkI1eu2fx3dym7kv<{zMgWnNYo1De?gE6RzdKi!xbw@OF8? z=?+KTg*c;$$ML{YNs-+7&i6O+pd33I@?bO$r7J@o^a{b5aoqkwFXN$Zftm-L+N*hR zSVEKYU?m2}K;nVuv5a_7OJ>)F0t)FiVex~#0xJ(*#=v>- zI38&2BzV`i<-y*97$da5!0{kn&Vz*VfIGH2&x1=`o|{zge?T5^t%7;bn?zz_8xrB0 z=K*So6t#cTh0F5~#Du0cq6OOrQpULR;JbJr<{zM|5}U7V<$-#i>A^gJB3UN;0KWdt zc_7Eurz%*72lZ0_5FWgA!R-UL51a>hAZm1#{u6kBR>1P$@|k#yeSltd#g0LnMxqH1 zCd>SH9!z#Ye|?Ii<$=mR7%edSd1veB@7slzz7KaiwGvs}bM48!Yafhw0NDr5gS+z} zX_ZKQUz&6yN1Dk~bsikW1MV2gc|6d(zu-JLpbI?-iT5i@sZ~j8y2t~!4_3%OsL!Y% zeec?dQ^!yq&Vy_H#wlG;@j!AqrTenZd#~+~M=WkWRS&rNkhpg{(Xp7~f%<)>UTd5O zh6kR^?=!*v0uq3_!F%r-s660(=V>0W?>i%Qvgv(i=fOk;aBQ990T)~U8vvXavyQ&A RtXcp7002ovPDHLkV1k>~u{8hy literal 14567 zcmV(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRafZAnByRCwBSz3G}H$E_@AaEHf|Sy@{*DN#Dh=+3;tJjXopJjL95=bLjR9dYZf zt|cqCSbV|!06a2^)U6+6vze6{8R2dK3}$fpKmV`O|2IFXo=ulkG@`68gPaH1QdpTN)kb?ztG-bR}xZ=m;pF)aL$9B z2hA4@+|FI5@a8>Zd}#COd~vW=w3~-2(s$QV|sL zaG}Gl*cE^Pzr`*NxJX8njFjxExw*k@j!06FL2wWhDL@=>CW3bi2LSPc3xK@&gzudv zPabaE%buGpcH8gh^ZA=RjRzb{!~_DG4Yp~*2tg5h!~k%4!LwuWVS^1hIBvGIna{XL z0enEy-_t|8!*)E#(H`UMJRE@5F`V;g(u^?;7@HgH`1P;ySLja$faxHw$6o=6{Vf4R z@FL5-I+KT!f|4c->=+KBkEH&P(-#2x{mB8I(K-gF2@?eHE!vV0SqcgS8Gr|nMd0n1 z0U+8EUsfa$JUO^LVIT*`QuHtF34lm1+rEMa*_+$msC!04U&AhdB_jbS4YNzo=CrD{bc~leJBJVPl)7nb2S@mw%^g`l2LB|j6c8sC_lylBLtCs zgEsWorU?^(5;oZO_jF$}%H>(U<%l_s7!SY5mpo&Tf&zl`j8K5U%@(`)g0ro_Jig&| zc#-D?4+2^#C^=&w2k%?-p+mp@o<27lbbNWiv-5BzqYxpJNANBBde=+DWOz_SFk!@H zK4O1)mM0NpT?b?j9PpA+a#4f=0gk~S_|T&f(aTQ*&Zz&J976pR5I_uWHrPr*$q};w zixZ&ufF_Q(kV63JCvr);dB}kQz%jyn!qM=+5upgd_JE(B+8H7MF7YO&W2Qj8Y<|JnL0+*x;rlL@B@u4`Lh;0XQGf0zew|d-socbb%V@ z5yri|Djs}KpU+S7G@WoR5feGMW{cZ6Vh~Z7w>?vaH@uP;*KDyP2ghMco9Tcf0C0=0 z{Y;;m8*Ilt4mnAbgailpfR;R5y^(3a+}vQx`@hS70`RsYF}}$&aNWvwgS`}FatKjy zAdesgQ=SzMf^A=Y6Wy+1g$Kn}Bs-5bN4-znqR$bLCF|Z7yMnr14TWO;yOIzyFc}^o zEqGu7h3NV)+XHoEU10AVUE54cd}yOB1{SiUw6dlnf>ZaA$aM#1RFB?2+>l zjSW~u??uTo2C}6cI&8ZKx+j9){eV9mev+ST2kRC123?7mL2%6$eS1rHQjjmt@{%Lw z9Fc|>c}+8B$%y0;xJ935%-q~y7cUq@P$VM`uQ*?x1@d5W@L_|U z6eM!ssQCc{NKD@FK(2TYI`jgRJYR2ciAcTyrwKC=0H+b1E11+Paf}cLoNe>erOYW} zN~6J0K+6rfIN-?3BeW=7W(;uP<_5bwV>Cp9WAu5#EE!XoahWDu0D!qepY?|6eGn8B zlsMqH#)CX#0D$fukG`eOHweRvymE7cUH?E2mlt`NFF2QkNFKhuQMi|)t5mXnrSTnm z@)DX2wjem>j@t1c@8p2cqwntMhtQ+DyvnQd;F6IDaJ~UM2Kxpfo^ehSre=$t-+z?9 z+s*P2U=;Kdg>j+@BWDI4?oMV^95%V6n4#m zN`(k$w%9c{bR!vgc$3#0kwlQ@vmDce`S>fMV+8ID54v02$3YW^Qjjk%c)C2x6Rw}m zC8Lx{ugC|q+@s%qrcd1+c6@opGkG}4x_upkokz$KlO)8HFai2liy&vg6fZapuex5C z92@{g-nMN*l7dp-kQ|sie51iO`36nA;Al^*unP!zUg3d*^9@>Za7z*{$Z5vt1G+Tg z0?pDg2##x*Hau|k4K3hg5Ih`QNl1CrT*9~Lxxr>WU-2N@Iw)mEfrD#qu+0&(l>zVp zZBCd_fIMPI15NawGTziju-%!IHy331v<7R`tyQe>0 zUgR~67z;2tkG9?6ZaU$ZXT9td9=wv5&}^{<;Mh0RjPLU11A_DL-97z@JG7S+ltGtOzm)NHZk(--+-TQ)<0iuWr#@Q&f~giBIfC@!FtgkhL5u@w|pB^kb! zbTt}7G-q~r1`-%^t34jc{<1;N6bWUk|CF8c{+c?lVgO?p-+YfyEtMh z6XsGdT}BKL(afwt>sj$2kD5z5M&K6R?vM0`c8ARs53Ex2jg@yJhB9L^$Sd}=a+xut z3r^#k79~thld75@*$Td$Sri)K3FotJ==F@fNh{9uP&nlLWh z3L{8HhM=Sohd5ZpVufe1g43ZOS$=Q^G{J5=Q{%7rvmZ zDts@72hPK@Z_($;R^s)?S?TX21FlgD0082M(LP-RQ5rCm)snSG79}G}LUIgm#d-1# z+Qu#Uh&`#_i4nGCJZH^ zC}$?h+_c#G22CkQ>7skaDLv5aexM)PTWtCAjIZRis33yl7F)+~alko^IH%EI&LF=i zr+69PeiG*qpw~R}LHO!iF~U zQ4VRw3IZXWuHb2+@k0Ch+}#hk%(cF?9TUuYP2vq;=7!0wj6{`xrT!~5M4t>4T zHMulUamHf6w+NxfRtj>SG3U6Xg>dnVb4i*XSQX+S$da|1cZ@&|oD-sN5FQi{wy>*Y zVle3qYn_AR9=*}P$Pu|DB;P1jj0fz;cRBjT3f37jZyxa&2TXCmF(;*Z>l5G(y$@(g zLQGorf;`|n`1a5A=VptJ&rf(F2E(YZpjW{28OM0RISLMd^2)~ZB9FL?d&2`4v>uQQ zF9k6T7>sDD>%+r=+YRnYK?)tV(+S5~tSf(@TwbVCK%Ox9fQCD?-5os;fiAD|YMd(IG&gLvwDkdDc$3%pjKMc(I1Yvf zmU&&iE&M@E^E@#SFF2-AMiFFg(Pm|S%0dTPrM^aDzu-aT-vto_q!EK-t?sz4FiF>X z!N`~ocp!o-xc+y}mLIr))^1XDgWUD8t&2N37$8f@Hq|`;()WvnC2OSh{l7k!Ok&Uj)-Z*xnxYvBRB`X z{WJX#w&?l%grAAg*6$R0?2J2opHFzN>%V4l1&C?DW!%d%NRzBhtq)5?j04Wruw1q` z99+}mP6Q=%Xy+5oHJ-3>LX%u;#AU%4a|;Mcyx>S4Ay1fbjpmN?guy7kP&q}(NS0hI zB-Ij`$nao?-F(*kz>(9%QnM7NU5=%{SVLMxsCdSCKH)(05f9+_TCLRnBKO$-77w_k zCTy`eeUY#18#K;glV^-Y--vySHgwp|nxUU7fC9j{$1}0Co$=5Npp=Z{0yu2Yx3_dF z85j@pRx@@GLenW8xCYJeDsOSn3WoE9WYt-bjCgte$S0ChLTWza7)KeQc+lsF**9n^ ztDDIoKr!J%h!;^x7^ESc2#AUYK3#C;N&(iMYVB}Bkjphz_$80f!aqyW)SrEe)}nE$ zT^^7nn_89RRY%aThzjpK9CL#vDg}Vr(XgrnlC97T2);p6Y=M=uRJzVhN9^l;SYjcJ zthc8?UTHCI(Lel!{+&CefFxh>KzoQD!3D4n2qhs~mICgnCji5nyuJNZ{^r7x9}J2I z7o6jWbBP#A1fn(Qnj74a1Eo=hG+@lhG8Tfn`#1VCcWC(hgfC>p6-XlzdARw6<8;7V zrG^$fm@%abu;d5ap(h55$_1wRtlM@~y?gTDc7q2gD9sIR$GyB&@|Vej(|~i$*6jvP zRPg{x&dq1MgW%#QM@z~h0B{<$mp~4lytanyv&)Lz@#HL9Rcf%|o%UuJwWDcNa3y0c zI-jK|9*8LH5y8bXj`In7B6ux%v?bsc_99`Ljv8dR$CdzBn-%RXcH9^qe3ftPSaGq2 zFza$}xkDcZ#e;QKJHBBembO8! zU12LW&sm!g#nwhu%0L!8K!$E{=1$A{+A40=+dNjdg-@a zNeD+C&NrIDm!xl0isER+gV%-KrUegtjZ6SMS#zIzv=4uwf8`ckjbOFpsm~2*FO$WSz^y}0PsbplXo5eB_u8DQ6 zB`v|My(j=Ej?sq=+B9O~3f+uG&=n7qpmA}~H8Ae6=Zfzi5{sG-*y?j0zT_3pkT7LfQ5H711;N#>E(8S*6>Po1 zU0QVmb4^0X!Leg-nlT$5Xb>q#@CykM99!vUiH6aI%C}BO?6WnYYhtl(6ED4%f)sl6 zkAI=RaDy#?A_>z6JOC*r!b$-a&tS*!%?;fGz~x!Kz5gUXI)(-$g5%96e6NtL3|5IK z^Q_N5bm&D;rlTCvgvrQB76;t_EB%{qu6W=oLEqgeh)gFOFE4mnHF2{DkjEOK3=f(c z?0kceBXS&YR;dh}q!qjG!QCw$OG57M=;87vFD55w7z8)IW537+u+#!oRtCvP;~uYy z9a0mJD1ylGqNOhpl&jEZ?rYC!AtwCwW;+MRTij>UCl-555k(h=YtS|u^poZX*$R*X z($}UDr#Rq51aQ^Vkk@`vp0znMM(ud{fYw<`CjxYLxc4pfp+j^2CeJLk<3zMUQ}Mtz z@M%U&1I}5lQEPa`vkTI8cen$=v1c^dzMNq~C(2lR$D}xA1th$Rcg6J{c}zLd9+ETWo~%G zD_i01{s|t`jRePbvnk`VPnD$psQg0drNP~Xe;Z?qY0B&#bz#ZB=W1i1AU!L() zIrd7zIEHI)aW5IUyQhcYRbKLp*|+FezZ;&gmWydWspbczM3mtb&*b2yqr5M80Km;B zyf5sf*IJRBF5#7O6jnpKTG2K)*lFY1R$I+f$pPFd5kH@CE~ZajDjHqVQyOt0GFh47 z0gR+R=ZGP{o7#aFJeWn04G&sw&|Y5Tg-y7rcX%|topyRSC!{oB$Vy5?0DgE?KC!#S z9XUAm4I0dgxEns8Gcnsm3g7}f1m1P%n;YzWpfDZfP&86|w)_W@FqMoFVc~wYGs%NX z(tZMwC>}(_u*I%sY3rZ7EF5cEEI~J8BGoKkoCjZ?@r6rTX_0=fkY18)Q_5zU5zD+} zFom02+!DdX0RwbB6cE@4^tOnu8LO@fXIJQ*M^I8WVqSP83-bjZ@SxtSXet<2lB!AF ze8R!-p!^08BCdOZ9m6#n>*^6c3s$9_EW&;)tO{#GH^kqag*ifG*ndTGDrzcfI89LScAar-wNdfu?y1Tr{TbeL&hn6A0`ANQtR$^IX zRVP@&St6#(3nub#-n1(mJE`@n5#xIM$UHQcR5uckI+U5yyI?DU; zi~MS(Zd&Rn57*!0bIC}XM|v3E zwiwID^)jpR$u^d+o|TdpF`KJqh>{VVM<`hxRkc!yA{vE!gO)q=@uKaLk`RsIC}K&6 zsp!GJ!8U8U%iN;1>MT}n$py4ci*3b&_Ez~*ZBeW=n3jBv*_etaiR)c$s=%1nA5Cn(S=W}_B-=2SR*G}YuPQ#HoSz{4wE0TfbE zd%yWapYtq3nlN2n@NAX?SL0_KEcMx&IaslmNcu?6rK7W%hD^ePD z5t&NJEuC?tg|cx=2|!L6k(ZWuHNSZ^J8_FP4mgXm{2(oPBGyZreL$OS?OWv@^VRTF zTtM4&*yagm5pcW1t#7CU0rOFgTugUpj*()kFIXctm4sN7?JH7Df8eEUw%GUvfkTfj zYDmu(RN6cv)u?QG-Aqb}HJ-sD+Ps3ODJ(e;&J&^(^>oR~HGpDbAJW8I8uZ$Sl4G-_ z-S6<=gYrWZfmiuKC<%!~W9Iq!BOX+t=f?)cmGv!B5cBkrf8_QS_m06v0WVM%HrNt@ zqm{ZKL{jy5UawH4L?@NpSH6r0i0Y_acRL*%;K&M4BQH76))w<%LXj`_Q2a8}#o#%1_f#_RfPHqZNXpJHE*wHW=g^zQqBPWAy-r4SFIt9^dc`z>x}>`~HC*(?npf1poNq-;LZr|E#hbd-}1@Em&D zp1#W095LrlqSZQ*Igh}O5o~p_4`@r)EnLNGE}-QOO`b5C{@~Uz z8Yw7o#87+h#biYTuFg6y1>RJ_v1&EPJ@(|`xWm>5unL!~v?0ZVKF^p-v^DR|Wu)w; zBL+JM*KFxV0O1@l`39UWm`VXk#D2Ldf^&i(qOl=oz!O}~DAQ3+VS}F2u;2lHg9nQ( z(JHkCk;%ao!F+ke`M3GOnnPIQ0oUmLyZoTJ#l2^Q`HX`VRt^rXy}>PPTUQG*DGj)Y zn#gN-KPN0MQivc@fuD}pFP^3=M!KciU-=tL&4)kOHBHLLJ+@A>(?kwzz4!M#U-7^# zc+jDhjN-id8ES#y1AKdj-TOb}m-!@T=fP6(puNQ%1e7LBRT`0tdU{&x^!pa=@P_v| zU~nF;2#OD2a$ufR?FXkii?)BD&+#HhDZuHQ;elmuODA}Z2mK=+yL-CN5ovmt_w%zn zEp`N4UDumO`XmBuKH+gb<21g@!Fe#ZJGwo8lb1YUOj`Ej)hBq1nU~X7iM~NQ?D6IU zn)({v|Cd_#S0$e}B|s>7(WiJ~xSSB3hmRNabKp{&_v>0Ypfx{ZBccjG)R?JwfDb|z z(_?0GYDE`|iI%}<&uCo$8y=w98da#O>co}@M2Pu!*G^j?=ZGmQJzk`sOb0|L=h*sy zhMOB~=aZ(g&VJF}eX1OztkAjIx7%B~L4k0ZF!=^ux!_n5irLcgVq33>kqBL2K7E1*fM!d4oeQVX1tIf+59t4BT0{EXs(m6f!G3(8`oemsr(sMQIW4 zv8}|l^`Upw-u}D%fIHk2D>STrY&M_hlk;$!&vO7Js`_<7gB`V>nX=I1fLcmmakO zBV-|`&j@UC2qrcXddWAG$>2`!cAk_!XtvmaKqi7$&$oy! z3iInJzidF0My+61c<{d1wp(=E-e5N!QHl|;&VzGW8WM}0yLNlXBX|b4JGvD>TpV%c z4x1Xv)1=GPDwVP*g-j*sJX}sl!(R4jl!4QLK{C$&6c2!0qp`USL#0V7)5i<_|J$hx z^c$mOL0O4{UCr*8H`tf~cC6pqnCv_9<}R=dro^RDpHejY}zp%$!DCj5;fIcz`pJ`)w_2t!dqDKGP=v*!_S{ zum34O&KDeQoj`jLHV`AHD;^k=$^8S}Pe(a~p8B`H;pce4;2EuGdjyWbJfHL(xkv9A zjpYXy062b;pCzLVuOAypwqsTJ+dty5y`{T6W1dfP8u#*QZsS;MMc<;|{gM8VC(PX= z9`lHC*vp;>;O%$x{rQ_b#Sv4wXm{^-`N4?c{YUu+_t;KH9BbJ_4A0;Gr~LQ2P}cQ= zYtWk}ZGy(bwkqc1pm-ofcOzF%igByK+_uqTBG;=hkLOgImgEt5WrTC&;mvjH%&uR! zK}SyKp@@LP2HRQ+=ZM5!3yvZgu|%YTg{|_Ek!_GdW%kN+zxq`}G}wdzc~$O=FHTy={26HFx$f78V9>^p3Hu*plxW;F~4ssxkt(mV|UwjDob|`MJ5F zO_~tnMK043=Vg?W%?IHY{q6_)Q<^buKH*b5<1*}J4?*GW_w@PlEU)o`Aztua^6&G5 zG-25PL;e!!Hej3DF&^;lJRHXh&hd=HGKu6j!xIb-axFg6V1=mu!|{i_@S}6WFJmmMAh%?r zngrB1?;C9Fj>lT&5~J-O@G11vjqkG0mW0&mrs4rDgLUGEsVtrfrt=eiAt#Hw&hS8O zTlJ|F6n7=nuvtM^HsuSNE$+M)qs}67OV_Wp#e6}HTsMH+41R|S-})c?EjUG|};?f&ohC5;%kLz@N^aVRc;IbLwAW(OgputlF| zH98!AmY*dfUW$CJgQpfe0D#dtp4`(mPco#86fYR8Rer7;jC8$h z)3BF)Nr-&&NBZINEZ@?IDGoXtXmJl!JQy*&{oU|D$3bNxkPm42+y9XNXN3p(e~AYk zZ5%QBpvvmnLS@ry16o)Fd&Xroc!{N`nOp=pkJqS0&L;EJN8$q7%D=jRrbHy}(279P zpan(v{Fz@bM!pK$h#4wkC2IqUjX z+eIyLTKl)Nh^2TCHt5F#_Qv4n->5(!*AXY#D>)PAlQ!|V8oYkTCDKY2W|}0c7be?a zYCrgpSgb~#*@jUU&9(TrHY>cYOm?iaPaP5gLa0o(&W_VAckMl{9GRLQhz8ZXl2F8w zP)=Xv7y7n%e5!Ho10G05a;7~9p+{fUaFzZ50nHA(Dl32(POK@>I>sqSL~cI}-SXU` z*?vdgOF_B$10G-hQ~ql@;ApQYL~!g|{p6BS7FlJ0cZ_E9nZ6tM^5#3M7e-9JLnk8& zLEFci)Q;$y8y!#JdnMrW-Vv$uv{rp6Ztw8m0(_pe28s!T(@8i4S!R`n8!}*&$mxwVzM?;)ru8X!E3_Pb6XDwZ6ihc`?gbTn4RJy#N4lUaUJF zbR{IOctAiYC{5Lox}HEoUT4Ee!W7Rq66p*{6y)iEJ%9oa z_KcRfM;k8~T%%}I%C-2Yrm)(uqeia~rj8+Noll`dKb>$W2?rW0L=PQE)=m3T4ZZ9j{a#>4E7jVfR@F0jFeiZjrO)4Yw z_jqXUXg9pdo8f^ozi(XV072ljPI*=A#PbuT%d%M)g2b}Mplho9vqNtggp zWUeC~)_h{9{)Jg@N}6y6bf;PI?YYJF{@>|e;~B%|Gak;*c$*HYmgSp2&>t=@@*>&d zpcP$MW#xIo@cLKz8@K4D6ONU8@(lvN{Z;_XySNDy4{q>SWoL1~z&@zG zAkP?<5f+TLQswh$X{R~>WqMaUAPtF*eTy!S7=2^fT*ZUD#6SZRo8s56=ujq7d*bYL zl->C^c<{kZP@U$+bjCEHIH%gYgSmv_T8C7Bsg6Ue{YIGg89>USpbFIP{)#&gEPr2Z zNQ;B0K5hVot5=l= zlZE+gnuI6?#g(kdL)d)41DJTJ_LYLD5LPX0N|(6>52|FKP9-6y_l6tv+wbWQ0HlAw z-Tv?LkLiT-GQ`^4g}ah4mweTt*dT?by`}rpdn1x9j&-UjlvG)I%_&dOmto9OTRG^!TBCNoX*S(TlA74 z+@Z}A=6KP9qq)H&x73M9nNK*fV=x>z>!_=9P3vvoPM!{U`wbqvP9%=Bnc>*1J2 z0QzdjtRmpGHq!^RFgBAkkJ4YZ1Zr6Hy7Eu(;3_5XfKDcGf>7}QOR{}+jV$TEsmG(e zQN;tKr~?=^($I$l!>?M&-c)0*&c=f1R7WB>cIt0k`&B#zw2clee;D@K#3Gx_R94f` z6%Podsvk{z1!PRab^ebd59d@69>{C`WKHejN=Al~aW|wqlCL%_#|w|_OGYfJ7Uhy{ zLkSAoya!kttQBX3i;nnfHlOJ`B2agS-Toi)(|p!}{zlY-n=N)Zsrto6c{r!8TW)S> zHy`C7f^vDrbGAn=fa9&sQseoAW1VoGX3XB0dvg_hsr}YE(7isjc(HncJM^y6h+AcJ zWc$Hvd+ZyucmG0viUa2E0k`L`@@>B0ED4Fb2YQ%}a$GX@qHQx9(whPJJfZCWAwRhQ zHyyCI!DGcSm``8imzvTL0i>MiBz4lSC7f1_d*NmJvx~z=JODJXPIX`a%5_Al2^n-) zwYh7w>|@(q1o#d;JRCAg*kUUgg?sAKC}Y$Pc<%2M4?w_lkazY0EwwtzVKLCFwB}eM z^7t;VYmT+zfeQ#CHcPZb%(Y&yd;odY;W0~l%pv$jD;!BkqP+;Ps3lZwiut4V;DZJs zW6JTGE7ow&b(XxSrWqfKZ3Ejy5h%;}+yotmmUv;NXyFeRscHGxHpM!tcMdIi6s`_| zWsZpRo?1w?i_zJCebpKO2pNPD;Zf|JfGyT8p#dO43$w z*x<&-6?h_e=M)cE2Q&NH#I085TGeu;!E(d|{W_u65I&&m@9CaAe0z(V_kYNbi{#Qq zU~$;uE=P=_c(6!^9IMEAI?1sV$nh(FT{Qkm7wovDmggg09V3Jdb~eGdsYgi+uXtK_ z8dq}!OFZEK60mQvaoXiMOGb(6wr@+)S;FK{e2eYfpXrBrz|ie*cl;_}@`$MvBpn&A z%_lEKSE3YLAn-!E4)Tce+keU59V1NdIOM3OW;h4t;T2yOzk>PQ4UI|#6;p}1QZS*p za_wotzzfBzFdaqXuy?`6B4Qc;7eVl5sLk~h2qsoCs-A%399RG}8}ub3bB8`pSn!~^ z!L6P{Kw;R+o_(Ve{o_T?Vkyw!D)U)G{P>Qym4XuE9|DEClwXIwOoe^m03fVWE@rlhOW$ALdmiW7f{`%=zygQeoG%z()CJx zpa?P*HH6jrI@^F|znp|&2}R`+t>?7VOo9*fg7eNWaW%bh>9e_j?dB6b4sY^WCp49W zXpa1B1xaGZa3$JgPGc@|M$QrGFvxOnhjV5gwk*}0w#DTc5kTgRb~;vg0B2_}Ku5w( zIvyQco9dW!cAzB`C8~@T?y7w9LFFRE;C74c;aB-Jo^cQ?f``K09Ujtz(F*E1b0GQ# zy>HN_L57?VFW>M*>a=SQ*KV=no?4#X@kV?dpy2|VYQdP^u@}+7{ZjLTIzRAec;Fh< z=;nwdH9x2`1j$ml4%?eQ(D!M;(A;2mdXgv8>J_&0XlApZ787wy^}j3q^Zt|kY&;b%ffoAIw&Kv9iefZAu88HO=`BX3~bHI;8wLHL?m9o#4MWTBGf6qSHti!dwF3v z3622-ckjWEP$MgPabR!C79_W4PcA>K~?Ej!C4 zQ1ms$Rbh&6wclu=-P;Fw4g#7j?a0H29_{H# zUPe8FXK7S$bBnuF$3BbkB-(5DKA?*iIp>UY{-y|2yPn;S?m~}_r@i8V?{vfu+tDFK z$NwFFS1;Ho%XpN-5*r<(wFwL*CY)_vQlaZ{3jNI==nrv_OXz8HewJ?~B9(%;%zh)- zbs;Q1`)qUSP1=am9ET5Kq$L(*e4*5@zSQB#r;osoBr(dG$f zHoZZydLia|3YN76>ddxEJXv$X)qXrXtrv9Cimrv_ARlWbw`s%>2aG7l?H%s)C?3Ou z&|?=i)Q@|4&k++8Oc^?PWtdNR$7(~FKGAU}ZOL|0*mRVm^Lj!~vq4Xucs^Z+$5hjt z4`9 zr`Zg>@eR)q?dUiLb7O|`dZyh8KA`Kg$!rtT{mBc89xYibrVs=a@}i?HHT{r6egiVG32Y}pe(N30ho^(vDiid`$`2SE4~*alrdPFPxLvC za^{x$ac@V>6l7jbIjK$jsz+08UaUjhPv7K=4`|XTQ=MMte63usU0!yYAH?Kq)k zXqp@PI)j_4vhA zv|ZtWBL&;*$!T>0d|8SP^>7qBpRJyDP~Whu_ySAsLA7EtJ2#ug!kc!z5SDg;Yqoft zRdbM?UuLK24b^d}(?ZIYygKa7Mx9MZ?3Zn=L#)~CDaqOe(G``FDSzlyDQb=SsssqN zD@p`xKGA2hXhq40Ox}i-TlyMWG~A-MX&ZyLRMg} zxX?*o3r`Gtc{71h*WA!&ZV}8irpGBccqk?Ad_a?D%sC-(hn_Dlc&(fO3gUc}_un|r zm;M6j;kflNrxG!-36|>F3Kc*W)6a66rneTMIgW_YqPosSjHz{Sr2u4%%?CUv$Vk`Z z6WYjMMmYG&UaErC4mR0hmnICgfoE8dWR;Mz3D~BRS3MPb!7}k)^Tw@XxHRHoV&9B{ z;%WoRrV4oliJUM|rO&r8&0mTox;D%N^SOksiVZ8y?>9R*xTso@?AX z>!GYiV4C?OW#AGo@PiKaxARQ40 z=pnYlU$i4ytfio;uqx`a7GO3S$l2~=8;v*KIJ2^IUJR-8|64`9)sllNkjI zVhCtb)GoidOD700yy2M~IBaA~fMXx184q%V=s=zJhCXqRem=_4veN_y=bfFl9l$vv z(WPM0#hPS7Z?JVF3568>go2vfPg2q*C_Hsz5yPm);#kyc}#e;

    |NJRJB2jmbz# z)D!9#6^QP8TL+Henk^nm*0XHa>IWC#1RJR*O#3 zaL*qoah*PrH2SKeWNC#5Y~!d$Z%RhW*1+b_V_RyI&cT`U&F84=!>K*Hq!A+lzI(vE z3)GMUjqh^cW~*A0^OJlXk2s1A3#jLC)q>ON=rX(^l9v#AbVPc-^L9GwoM|7>GO=q%fr<9n>2`NpOn+;O6s_Jk|4^*Y(2xKLB$&!Rh$s RLHPgx002ovPDHLkV1n%S)6xI{ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.png b/buildcraft_resources/mods/buildcraft/textures/blocks/oil_flow.png index e72280c42cf4d21e80c1e1733fda94d4217beedd..987652292a4cba5f05c7ac6fa1d4ae7ddcc20764 100644 GIT binary patch literal 4980 zcmZ`+XH*ki*PR%o_g(}8L@Cm%Ktc;8H0e^MLntDmXy_*Nq7;!XMG@&mK@jOhs&wfD zL_h=t6o?@84G%u=`{(=CtXXGf-8J{_v(G;J-ibE2p-Dx~P7VM7l@?OXh!7zFKm?Ey z6P_^XR>Ooqb{A=J9{?yA&TbHp@thR^$o1V22m=FGFCVY_u3mQ`S_lN>?maITx7*GD z;5(gVj50A^Wrpv~?W*cTVV>!D88MMUj8tPWjEPqTxyfj?qqtv8F&VbfsjCxlbmvBa zHAvDzN|}O`G?d0r z7O8U4eF^RA=v-J5QO1%(?*g=>RZiUZk9k4BelQGnji-gA2>|(yQjh{IdYLU^mm*JT z)>PB2L6|U5i%;Tp9a0P`~zAn z*BE8&FW6@&i?sQrvq@m3Xuj-x0)X5^CPKD5$G!v9qeKUcVKs^NzqEbY)y=;&_>?TnVfI_R z=20!h=@I8BPluL6ow*?6q9MI^oLa`?9f^FNXw|0zAFqs@I(?lNIs_}uO9PeeilBf* z;lf*v;NLoYwB|l7U-tlDyWXqyGe0R9;~Kg!h(6s?I@Zj+0$^OUo_Yg-jT%(Mq_;|` zixdFVa63fhT& zR_2syF?5Ycx=St6X8N8QewXIJo;16azX3}|q|!~wV9z}r1#*Zn=Zzy}Ne|!WZbcH& z$3h`JQH+K>I*HOqaibU$h$)hD8-DMCT%@(eheU;LKqBNQqCr#q8TPFq{4?b{L|vgQ zdzi*ciXkT-@r-!p+{~eS)$H)cGA~w!N?d8C;}sEIVlCfUNhCXNi-~l$tG>A|M3&^( z_lBpGvZRx}@@6TxJ{s>h_y$cxk5z9WlOaN@LhQLzkmkDPHztvVkV{Z0x@j_5GH{q- z8y`ge!buLMI(>sap1;#;C$DvXDXQL55s^D6^JMe%Z_9QFd1r*FCq2 z?>-;saLHUZQise&`c^f+r+x?TqA95&m_oavQ2cC}tR$=`HZ*HRn(k}1(O9-F6ERuw z^|Y0AnshHybHN(HK&HfA@?`DgtH~UKq9#SfuZ!o3DNJ`v`%L1CY>b1-HB2Rq7mLU~ zr<9l$XBn&;a~PwF6bd7YQH5S6O0R+~j-!b!+I8FY5w8q$-`FlTbV4W`*{XbnxIL&! zA|7C+JFdRzp9*{^Sf6&xSsx28E_xw{kkpnmt1{Yo=AuNhnC89z+~)?_3V%WBPH@Z| z{J_Pm z72_#mTmg9jvmRU?UoKMYkUJc!Rr(iQJyU7NVt?N}V=hwJ$a4AUi*yPyrpa8E) zX--^42_>GP9AJfgl=k+5af)`${4zw`YF9?&+b7$nE`%l44a4%rG@fYCJa+4}UW6`s zc6xT^T_wKCeN{(qO>Z;9NU!d-z-t9v1>LUxPyH|Z$J3=V;o=h#E14^q6Pfe1c9y=D zLN$do@13>YE?K^|*sN)|6K*MIk#BBld8iHeQZ3F#9_RTRnO=)`q5 zE@}JVy>Bh}kKnU1t1{a*3TG-dWj5V5BWH6yN#zJ+TS(p?YVSsTFL!er+p<}7SK$+pyX*Y@eRdu7{( z&m$i3o;scSpAG{Bm@6O@I2x;hwYqS)?;ptB9H%5d)Zw1S1qkFRVqps&P{`?Ybl zp?E}xWrm|B5!QlSH@1<2dj3y;BsNI-6X{s}>n zwbm*)QHUb&Q#>}&lSpQ?Ii5@erm<(zKNx6v;=t;vtjF%#xA|JGRQF83DZ?KeZd z$aL{q#7*K-*!!3oLC-P$k`1%e^5Dj+{(2r*o7Uct)^{L}bqZ7R0o zEtUEX)zow~)%?xs4g7EQ8PU{!{+asF8bn=QGwgkXb3xBQzk-sZ$I?38X3scEZnLc^m`IYysn%~mu9@+dJ7nS_< z!^Z)o3nZhLA9A8NMcq|1wlg#`jWZ6d9IQU*e^MMCUz_tk(ww4F*ygQB8)(2Xjg%S1B*cF8ag#qjB_deTiXOYvwVl-F5%)NT4Vz6)^KTjj`>9l-52`u$=)9Use?8LUbnedZtmYnZ zcY^UH`nn z8xIv6Cb1R0- zcs;fKr~v?^Ia+EeCce`@aKjld#V8}}d)gm-I-b80umtNR)k><-n(!KUC>>)kojR{w zo0F5Xcs;JGpxJYVYo-Psx9A(_9~Wh<=u(zi;;?R8ZNuZ`5VTY8KUE{VOO}VP<@mY! zX5v&KZjr7mb*k&gxz8c>1Z2%n5`b7YrXs3S>x`#|)!LdEAM$`ZUshx8UlIjvj5{bMk}X3DsN# zT%3^tNuM*WbFGB8XlE0i2k|!cS zfMG~T`APYI{!^mdA6&?0iby45zn10FW(Z~j!Ykx5oi@vDjAzM0DLG_diA#ql5W&g?G$+2H!6!;^pgf(n8 z-|Y;mI1<8ANKOg@3J{ctk%;kM6h8sbMbJgUXGL6<*^4;`J1G`2X829`kpF9I!rXPN z>)bz4Dg#ENiPBO2tavAorXFPo6nVEd4>`CGvA z8`!A=++~_-5$=7rrw6n&pQ2FOM?-G4x9hsV;|K3nXn_B-UzC+ql*Ko;k2V!A3?Ja? z0~)Kow?S5e@~R&wJ7fvqEOWL%%0@4FN7NQC67oN8ati3I^P*3bNs_tOIOG%GThH?Q z$BX;N97q^t{CF(i@q6;iFnplnUsS$!o-{r*{3CEXPb9qAzKF@dX;$(1|61m(V*k|a zANgL0336c_{!G`OVFl&24Mg((z;RBP4;L*nj@}6zwQL^HdsD8cULCAQ*O(0&_GfFv zIFLebV!{f1UMC4LKT#&mXVv~aFz^Wx7_= zh_^o1>K6rgE>*!w*MRMHwe^WZEMm(z858pVV8iy!U>XMgjLJwDHEZ5+Uv|U0&?Prg zbyo-GI)AJ|HqL+>BQ`BLhtVNRb^K53nKaim=L2q(pf|9!3sROj!OXkg2kSRLeM@TV zYU&-j4zi~zppVv=X;SXRTo*&7okhI6&wlIQPB{dMjksmO%@SYK=eFeG-1w+w;d!H*P zp5Af9mMkDkH^wiJ5u{oMw~8eZ!V^5zX|WU!j(ptyPmf@h|F+E#!-X@c{HNHP9wRjB9pM85)|9HYVo9B)|fPumAOg zGMB8@JZiBe`rj<<9^fzzF=RR<=PpTL^~|gPb!&j;%%i?whYP;?qn9)07~)dILlb>1 z@5N75zsRm!PfiTSq2o2zci^;BV`WJeqOx{GGG%ya7n9#M`9*%<-uR1jY;O4fCEW)W zuD2;c`{gcEP?Tk7ixJU#pnNjV_Ng{E(tr2rb7h}ts7Wz*Ulzdo+_<#<&FGMDtO2yt LZ>W{4+J*cFM*Iyl literal 10198 zcmYjXby$;a-)0~k0}(+%Cn6;wons&+Ez%7lA&umK(LF*$rI|EJhcwb5IT~pg%_Qf9 zDd0DJpZEFRKR7Pfb{xC8uk${CXI!z`T2H7cZc`8t5KybCDC*$Xdjtg62*^nAzlEfm zj^h_{cNJq#0s>0MFNxlkkVYwY1Q@1gd8iB?B5eB2DMLfw*MUir%^el% ze>GHmHwk(z^-nt;vgTVE;Tj;ektGCRl`S|qcfR%R&`y|4a13srF8KP1hG2vuj+C%~ z;tMV!f130@0Yw4b3m$~##i*X;J&8Zr6FyHp^9Dp#_OYQw0a8H(uPfJXrKC>yCy0gr z`oQG&s^D5$FzW0zRmZ;U(GlQ$&FKs#Tt=JFQrD~y&8z{?jy%|^26WTu@*qZXhA3~E zVt`YW10$TxnDCAh;}Y_oDWm`}m>$v3MuUDUQ~FC_hUfhzw;hEb-=@CiN%|gzL$5u= z{Y1!^+LA?)9q887w2UI6J_C@%qz)~axI%h(a%!hbjdAH%V*GvfQ-rU@O3(5#rk5a) zatM=77#9G;_`{g(X0E13L{u>+FMnp}^%1@x;hvRLHalVDgNjAADHY4%NQ5E_=-9lZ z-KjWV??c6goPO{S3$yO-VH)gOw!(CK|Ckl_q?LK7R(9!?mmkiL>e zOrIp^M8PqHB+F{{&AH?hV^#Lj>wHB9VBN)X`!cbV(cPQTBF{y_X>drm_Sg#^h;W{* zbhtm0pWI1ye1@}cHO?4x7cjS>8$6-Yg;{HwJc;S15&^$aL^W;a1mIs?R5E?qIfbb%oub=5p;1A5$Id{ zeXnuLyA^!w9@=RmTf9kpLJbb2L{1);Ar=g3^AVM`lvLeqh(}L-9DChh9VI23Wmr=z z?2;H+es+bD9oXvAPSWr5u+_7LlTfGMq!n5!&2r;^;UzyouFClU4=_R{My{Y2q4E`c z+Bts_cZIR`JD{AyEu!HAK;9QXENOwrgkI}Co_Dv(D9Gb07G@J04*M7>qYQ=~xH|j4;c#q4dk`)sMcGgekIzD_T(g;L!(*Vd8x?2#VE6VwTS`w{`37RxOT*P0##Ik_7q7W)^g3Py9Vd=V;FepDKeZxi{z zbe!Ut*VB{udvsT&K}^H0jhGs0KRa5xX#dc zm?^4^k*hLt{l%J=iWKWEVQ(EV+{-024-@(inPmgLAY-_WKGKODg-x{QwRg0?F@I|L zQVp6E=Gexf?1fjCha9~@`E5_DHbR|&vWqsC@aQoWtKGH}U4f=0X6oWUZN-;KN zH31?h<0V(a)Mqr6(S*^Yi<-VT5@uHceSSZ`Gv8nMJ?2Q)R&>;H(Wc)n3!fInTDE3V_-n87(BsTD=f;i@shW=Idu&3aA`=?{}x zx6!Y+`O@IKu!PW#5Vap=sU$|q9dKVae!gi-%y&ztl1wSfMS|V*h(!?6i;WU0+&D_V zt09yt!I{+!SU<5THUK~I(XRIBT=$=v=J$4p2tL7j}3 z4&fCkU;lai|XR>FBPrC33srti$(ea-IhM*4p-#X>dCVJ?w2aMb^CmzT74X=KVWL ze?UNIY#YFHctlTyrpo949fVh`g@+eT?jMw0p$diUCygS~d`ED<;kkC~PZgnUZF)kT zrC;G8irhdy9)#1|HObsD+b3LVMDfRBsdMH($0DIWCnOmrtk_kFCOMlQ*(nVaGC=CO zx@O__lg_*%P|J+Lh-Bp|{;{=?ftiGt8mC@m7h#O6z)<_ATJHqzDkXk(cQ2*{bSpkl z;JDGF|K~o>K-@}P@r02Q!+odab>dWBw_b`LXG8~mEi7h2EUiw_(hoqF*+H(owIdwO za+*91nfeP4m&!4=bjMhjV=oX5m*h)>$_WjT>V#YS6xAAN3e65rSVY8KMl&pSl$0dqoId5$KW?*f)flQL;@;MAi+fp_n zk=xQ}GNYe3Yq#lJgxjN9nLg>%_J)Y6s=T{glX10`H@@L*} zrzk&Z*X_mT^L;zVPZVf{v~%_s1d*)9=qfTEc( zS~7UM^K1qV%IP?X(Dm9VO;y86pX$pzVaQmDu{Y1%#)9Sf^OIxM1%hPagiS0w&R z*i@hLV49F_*$2BH^<`#l-_XMax z_~M`Mxds_4*JGb=keBgzfl(i)Z>_*i;&WT+%8$=1zzQdMbaRil5>+^FsI}GsRN0gV zXLX0h4v$a1Kxe$;eB)Ukj7AU=vOv~d!8YCVtA1>6grR?)Ud?l%g);R-SE{!U38>y~ zQ|&qxXFY+aWhCJ*vdwCSIGH5AyV?k&XCc5SzgBu1;LzCFIGPrl1eJ5_JtQX&%+yYM zoJQ?-J(==|B?84;LaMLyHbZ;raxEjt48B4ZyZrBst zf0^qhczfEBQ|NXC*s^L0Q;TyYbm#@v|5E29_jVZVjcE1P$AVqOP~Y#k^&XzdeW}&A zlvk?aeTMX;8~?bC9zp=k!h$n_-%{$^O1J%79${gAU5oJGRA5A305|B2>+;uS=t@Y^ zSRHxn#d5^P&-sXmOC3UDyioI!pZH&oa0NyDJpGSjXv~v)lW(TRL43?1L>nG^9?(`r zyN#`2KzcjMU(_`u#O>yd7j_!Nl+TIQkLr{4MV`$@^dQwrf4Yy!70v!eYM1jA!9-!7eL`NLHH@>5C(i4VpGGJ$_Jh4 zjV=~qiDnm;F9#12I}D7Jv~YX^4ep~Fbmp82W8FHN)e`x%bQ`IBf+Gvg*j94?WH2h)MHK7VC>p_Af5qitW8 zcp8};529b;ZiZ0u52+XY2~7IPuEVJwstNe^@y-4{{**iEIeRPKzfafM4s1qc7vS6G zarp zrA@tSkC1bdAEUZ%^%@OMA@$BPwjd+M;WjH3)j?JPx(TTIll$t=q_`{UDlc|P@YFjr zprzA^a}r+K7MKmj7L`VI_fndfdo^77=Z<{p}|^Y#`AqSqViFi>9GsU z%3*^@{U6vet`c?E;X*DR!a7>1p>#~(^JWvpK|qxSgWOByd+yM}Bv791hZ`SqWy;TJz4V6XH12 zDdBmSEUtO%Bgl6a$`mifS4ts5A*qD+N`S3ST;wyf^Yp*(dNVg{EvfXRq5j!3wb!qI z%#9+?3BjrGLWca~nkN1i~q{4STlV}VfOkk-;Unz5b5Sc9EgSchmEb-?DtrD$tSiS{*!y^~(ZLc^umnC`dAHCuvG5X5-2^M9RG<@q*!qZbk|$NSabhP?ao@rub2^n z&vW^;HxxMzc|?AXWG4Am-50h~!$l9Yt3vis{6IrZO2qafs95;zd(#JP%Z}&fnC0oPCH(k`W2tggjn~0Z2K;N95yGDQ1? zd-IUEC+X4CmtC0i2>ZLOzpb6~&9v-Sb_H0cu`Eu#q_>ZGF+O+D{+G){q~Ggd^ zd}p0K`M*Xhp5e?FUS+#xABR@1?VCc2@Bl+PHA4sO(u_ofbD#rQ{H?x;u$;#1hlcN1 zTi2h)EhK-M{=v;zS%<=X@#p7JygA%_z>@(>0>W;r{8tRPd*fZmpAJ&;*h`;?jTeOB z-k~TrHtn4{VhX(8qfh=%x`H>umyUmxp~^qD_==NZZ-Eiml4b3TCzt7ZzJh?^x!CNY z@3(S4dQju1hhRT!TJrREY?tV=^+QVawB*)sHiED4CI;DI%dDgba^l~OQEMD61zZhL zdMKIPwDufwB<2w`QJw)acW6_=NDG}!XbH~m|F(aXtw+nTj+I;E%)##^%j`3?P9wHP z?3fXn_Z+;0=Y#6z$teqmE0Xl9G)~*j#ZZzRJ{9ge91<#Z-=HzE*XUe&g&m&*0`A&V zJR3Urcyb|`Iwzt}Gfx6$K1tr;v(P3ri~LjjlWfo$GrBh(^O}yb;Lnon(MKh;C%pKqZ{<&Xe`AzR9WhU=+BZ~dS||8k z;3e>v1gID)5@*!M9}2kq!ZC z4c#D7HjVEbO$c-x$SU+R$`{DH=YQZP*NW?S+=G^6fVc}HT)b;O+P^kMg%bUA8_Rf_ z+l7aw!bQh(PX3o#GjN)q!x@YLtlH#TX+mMlMpnp@!beG2cZqGHRMg5Ak^V<~Ol;QP zOWH>C575lwfH%&kFNkLEKbTPaHzWQpz;IZy0k^MLL2}0>3+z8B@jspeLW^CDQ{paG zRMBf%haDEzGo-*|n2&kU23oeuI-Z2zJ!K~7(?|<4Nf$GL&v_6obDD2(=NAO84^&z- z-o&_TtMCLFSsa-$jU;zdmi8#|%cwbvQBnBasf9 z;r*@zljCD}f2pBxOy|2+R-L*I7SQfv#u!qI90u91afcSjU$2y-Y|{I=MwyOtM+-jF zA&Y1c9yUWwm~vhlbl8)?598tk`nj2AcKIWmv6hb+i_bonBNMZGzo^lcFIOk<<;OC9bPtvDuOXrf;uq*wrEi@3D{_McB?eA1s%o8MGwiw8PNY_FJ=k( zL*nkMn1t>*+NkSd?`NzKkM?xcOpgosSYAy(K*AMt94$aoJhwOJIpi$jxAF2*VYBQv z?M?bTSKT<$2e*@g&Opq$cwJGzMfcmpHS;*@iSLNvlw)J(NA)$p1pE*m<^wF+ti%?? zzsCC?FvCXzvcjoB8s~wJiA|0b{8mGJ_nP)W5^3@_1I*8aV}_S?e#pautOWIw=b6RF z4?@EUhMbG9z(usD74P-apTt7eT|0E}oCMTJ`$r5Ef`--vGXWmv&Ytv17cs8k!8QI~ zA0N`BduEPR?KYrHaUD~GoF=%A;!#paj3vGq+cCciRq%`!dF3DesUY&@LY*jYU{-W; z#_;QZ&F#NoaWLgoa@1Z!{kQpbd}*4~_CECC zI@oc%eVoR}^lG~SCAsyW7<{|BI~Ooeny&bURURc+x&N@~kt%*xL_V-=@D}_;uBcHx zFWwg~vixGu6Wl=Q*!hH+j;WQASYM3gkFcix^J+dPmAcP#O-x917<ai%8-lcMbij6 zitzf)CUft61$~*Ft78eGeuN&R z&YtX(owC#W)gAA)2!}e9G^kMwWQ5=6&zR8Xl556{?YUJh#S*gaDjGp9rT!M9ml1R2 z^Ni~&fp}_b+VTamcm#JvMpepIopB+)0CAZ>mcdjV1}5SZ#sEaUN(TpQjR=ZvdcFA+ z|5va%;Cn&aUX@sF>$8>g6QiA@_qWbnTRu>+`=2*#E0H z{JZb>DbNn+KDmR7dxw&=cl;hkXO%sAA8;UlmEOfK=9n|n@{G89F*(eO4u1;5!*0>7 zZh%TZuPageCBkR7&sRFpsS^VozQZ#4`BnIQgmd$U^>;}J!9^cXTKFh<(>0DolGT>E zcR4?A*-M+_ZnJz<3RNBlxKtjWPiAYk(ryw>ckiU|4)n1VtZ~?Dq(`snpWyj1G#k#)(<(+~~Jo_=&@RM#`mH`6fgBxW1Y zb+(?t@^8C~@KSu1oVLjQ0o|%U)k24S-pe@{aG^5hNx|1bt5=$p>=#pP0NW;N7X=vw zYeK9Tk3!c1a2>OIO_z6Ja?+r)FSw4JN14Pe^?Scl)S-%SLlG(*Bqn?8#JSku{4zB1 z%gx)Us87h3GIOy}`y&}Q!G;M!mWPM=h*=;DL0PdGGC$ppGDyNu*g^@%T@|ouwSa#9 z)8Kr?_iBWGo5kcs(Wtlww8c$M#Jhdk7J4DsJ?Xoix##EKOL`V?JbMcKo6^Z<$O&4S zUiJ9@T7=6Vu#Sqq56It=_CHqjck;4a_^+YIAjwa@f4*o#uJ&1R<>Zm6d8I+q#ryH1>;Jd!xUI z0blF+S%1DT=1s?nOq83dQzE>*XPx#_iubpp!o~Yf3Y zyH&sTV;%i9Pw|SL)VTU6Y4*F3;zQRDQJ=}FT*qIS4oN*KhemCT$-jNrTpYx?fkks)bje&(%k8+e>MQ{*Bt_g&8&k!Gah?IQ5@aXC&$j0o02iOdLgYCpt6mb@FvUt$f-W{*DEj_R?+r!V`Wf z+QyA8FAIY7m=aqIjW(>dz zp82KbX3+s()R1)FKk0uaiO<8I#}NIBH=y0Dljz3BA>U(YE%BIc;X(@K_=7LM@eH^POK1|BTmE_^S1 z`$SWZ#x>KsodNlVPLEz~o-8uHLE=b-eu@FfM{~VDcuau@Vv0_2>5eI3GrcV^E$K1- zUU1R#?`e-rdD~aM-_!9TdEy<-f+oG&v#EuB1287U+1dOQF?JTZ@WlUfpsBz#!=OTa zSObcbsS5I9F4APWG<{>jm@dJE@6=%?Y#TbACw6}(<$RH8nlC-m*gPbwVhX-;*1?=G zmWRNX=pVG$k39V9w+&$QAfpfSXC1$$zLFNa0jm5bM8h}Ypl~38RKSt9iqu16_jv!i zhY7cEL#o`&Gqap{ontpDyjD(1^9+e5rAZI@W_BjWhHvRB4XPT@P34*R0vaT7cKVqi z7_YEspDnXXKR#`C)8qmh*K%2~7uN%VsYB)emQ{a!f WQVtXyOu?VYBT!Y+Qml}-3j04On!Z{9 From 602f5b8b22f4ddb49c0352fb78b879d340d773ce Mon Sep 17 00:00:00 2001 From: Flow86 Date: Mon, 18 Mar 2013 09:48:24 +0100 Subject: [PATCH 24/93] #676: adds a generic interface for pipe(tiles) to allow them to be solid on a side, a facade always overwrites it --- .../buildcraft/api/transport/ISolidSideTile.java | 7 +++++++ common/buildcraft/transport/BlockGenericPipe.java | 10 ++++++++++ common/buildcraft/transport/TileGenericPipe.java | 15 ++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 common/buildcraft/api/transport/ISolidSideTile.java diff --git a/common/buildcraft/api/transport/ISolidSideTile.java b/common/buildcraft/api/transport/ISolidSideTile.java new file mode 100644 index 00000000..627b0d88 --- /dev/null +++ b/common/buildcraft/api/transport/ISolidSideTile.java @@ -0,0 +1,7 @@ +package buildcraft.api.transport; + +import net.minecraftforge.common.ForgeDirection; + +public interface ISolidSideTile { + public boolean isSolidOnSide(ForgeDirection side); +} diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 95d4e04f..1bd561d7 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -40,6 +40,7 @@ import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.ISolidSideTile; import buildcraft.core.BlockIndex; import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; @@ -98,6 +99,15 @@ public class BlockGenericPipe extends BlockContainer { return false; } + @Override + public boolean isBlockSolidOnSide(World world, int x, int y, int z, ForgeDirection side) { + TileEntity tile = world.getBlockTileEntity(x, y, z); + if (tile instanceof ISolidSideTile) { + return ((ISolidSideTile) tile).isSolidOnSide(side); + } + return false; + } + public boolean isACube() { return false; } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index d6cf554f..90ff24b6 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -43,6 +43,7 @@ import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeEntry; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipedItem; +import buildcraft.api.transport.ISolidSideTile; import buildcraft.core.DefaultProps; import buildcraft.core.EntityPassiveItem; import buildcraft.core.IDropControlInventory; @@ -56,7 +57,7 @@ import buildcraft.transport.Gate.GateKind; import buildcraft.transport.network.PipeRenderStatePacket; public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITankContainer, IPipeEntry, IPipeTile, IOverrideDefaultTriggers, ITileBufferHolder, - IPipeConnection, IDropControlInventory, IPipeRenderState, ISyncedTile { + IPipeConnection, IDropControlInventory, IPipeRenderState, ISyncedTile, ISolidSideTile { private class CoreState implements IClientState { @@ -663,4 +664,16 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank public boolean shouldRefresh(int oldID, int newID, int oldMeta, int newMeta, World world, int x, int y, int z) { return oldID != newID; } + + @Override + public boolean isSolidOnSide(ForgeDirection side) { + if (hasFacade(side)) + return true; + + if (BlockGenericPipe.isValid(pipe) && pipe instanceof ISolidSideTile) { + if (((ISolidSideTile) pipe).isSolidOnSide(side)) + return true; + } + return false; + } } From d2598ef011fde820ba9f785697361304b427c8c8 Mon Sep 17 00:00:00 2001 From: Techjar Date: Mon, 18 Mar 2013 18:48:04 -0400 Subject: [PATCH 25/93] Trigger block update when placing/removing a facade --- common/buildcraft/transport/TileGenericPipe.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index d6cf554f..0091d95d 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -568,11 +568,15 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank return false; if (hasFacade(direction)) { - dropFacade(direction); + Utils.dropItems( + worldObj, + new ItemStack(BuildCraftTransport.facadeItem, 1, + ItemFacade.encode(this.facadeBlocks[direction.ordinal()], this.facadeMeta[direction.ordinal()])), this.xCoord, this.yCoord, this.zCoord); } this.facadeBlocks[direction.ordinal()] = blockid; this.facadeMeta[direction.ordinal()] = meta; + worldObj.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord)); scheduleRenderUpdate(); return true; } @@ -594,6 +598,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank ItemFacade.encode(this.facadeBlocks[direction.ordinal()], this.facadeMeta[direction.ordinal()])), this.xCoord, this.yCoord, this.zCoord); this.facadeBlocks[direction.ordinal()] = 0; this.facadeMeta[direction.ordinal()] = 0; + worldObj.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord)); scheduleRenderUpdate(); } From afc4a84cd38adeb8eb7a4671b3d52585530b4cc0 Mon Sep 17 00:00:00 2001 From: Techjar Date: Mon, 18 Mar 2013 23:05:15 -0400 Subject: [PATCH 26/93] Spaces are now tabs >_> --- common/buildcraft/transport/TileGenericPipe.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 0091d95d..2769f480 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -576,7 +576,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank this.facadeBlocks[direction.ordinal()] = blockid; this.facadeMeta[direction.ordinal()] = meta; - worldObj.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord)); + worldObj.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord)); scheduleRenderUpdate(); return true; } @@ -598,7 +598,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank ItemFacade.encode(this.facadeBlocks[direction.ordinal()], this.facadeMeta[direction.ordinal()])), this.xCoord, this.yCoord, this.zCoord); this.facadeBlocks[direction.ordinal()] = 0; this.facadeMeta[direction.ordinal()] = 0; - worldObj.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord)); + worldObj.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord)); scheduleRenderUpdate(); } From 3507cb1b0f46c57707c1a3c6ec616c66022e05d5 Mon Sep 17 00:00:00 2001 From: Krapht Date: Tue, 19 Mar 2013 23:00:47 +0100 Subject: [PATCH 27/93] Fix Engine model texture binding --- common/buildcraft/energy/render/RenderEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index 1d513876..304a211b 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -192,7 +192,7 @@ public class RenderEngine extends TileEntitySpecialRenderer implements IInventor break; } - tileEntityRenderer.renderEngine.func_98187_b(texture); + bindTextureByName(texture); trunk.render(factor); From d23562f1e391f92f1fe75b6ad0bbcb3aaa8cfdc0 Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 21 Mar 2013 00:22:07 +0100 Subject: [PATCH 28/93] Uncaps method name (sorry Flow) --- common/buildcraft/api/core/IIconProvider.java | 2 +- .../buildcraft/core/triggers/ActionTriggerIconProvider.java | 2 +- common/buildcraft/transport/BlockGenericPipe.java | 6 +++--- common/buildcraft/transport/GateIconProvider.java | 2 +- common/buildcraft/transport/ItemGate.java | 4 ++-- common/buildcraft/transport/PipeIconProvider.java | 2 +- common/buildcraft/transport/WireIconProvider.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/buildcraft/api/core/IIconProvider.java b/common/buildcraft/api/core/IIconProvider.java index dc259761..04833918 100644 --- a/common/buildcraft/api/core/IIconProvider.java +++ b/common/buildcraft/api/core/IIconProvider.java @@ -19,6 +19,6 @@ public interface IIconProvider { * @param iconRegister */ @SideOnly(Side.CLIENT) - public void RegisterIcons(IconRegister iconRegister); + public void registerIcons(IconRegister iconRegister); } diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index 3f6b56f9..a7cff883 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -57,7 +57,7 @@ public class ActionTriggerIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) - public void RegisterIcons(IconRegister iconRegister) { + public void registerIcons(IconRegister iconRegister) { if (registered) return; registered = true; icons = new Icon[MAX]; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 57135ff4..acf9a9c1 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -889,12 +889,12 @@ public class BlockGenericPipe extends BlockContainer { skippedFirstIconRegister = true; return; } - BuildCraftTransport.instance.gateIconProvider.RegisterIcons(iconRegister); - BuildCraftTransport.instance.wireIconProvider.RegisterIcons(iconRegister); + BuildCraftTransport.instance.gateIconProvider.registerIcons(iconRegister); + BuildCraftTransport.instance.wireIconProvider.registerIcons(iconRegister); for (int i : pipes.keySet()){ Pipe dummyPipe = createPipe(i); if (dummyPipe != null){ - dummyPipe.getIconProvider().RegisterIcons(iconRegister); + dummyPipe.getIconProvider().registerIcons(iconRegister); } } } diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index b3a2e257..085f4519 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -53,7 +53,7 @@ public class GateIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) - public void RegisterIcons(IconRegister iconRegister) { + public void registerIcons(IconRegister iconRegister) { if (registered) return; registered = true; diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index e203db61..e9f06863 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -118,12 +118,12 @@ public class ItemGate extends ItemBuildCraft { for (IAction action : ActionManager.actions){ if (action == null) continue; - action.getIconProvider().RegisterIcons(iconRegister); + action.getIconProvider().registerIcons(iconRegister); } for (ITrigger trigger : ActionManager.triggers){ if (trigger == null) continue; - trigger.getIconProvider().RegisterIcons(iconRegister); + trigger.getIconProvider().registerIcons(iconRegister); } icons = new Icon[ItemGate.MAX]; diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index 156a3f0d..f302d29b 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -58,7 +58,7 @@ public class PipeIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) - public void RegisterIcons(IconRegister iconRegister) { + public void registerIcons(IconRegister iconRegister) { if (registered) return; registered = true; diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 332becf3..45579d9b 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -32,7 +32,7 @@ public class WireIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) - public void RegisterIcons(IconRegister iconRegister) { + public void registerIcons(IconRegister iconRegister) { if (registered) return; registered = true; From c352bc53ad0c1dfc31849e0a6cc58f87f4ee84b6 Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 21 Mar 2013 00:24:41 +0100 Subject: [PATCH 29/93] Fix ledger Icons --- .../icons/{guiicons_0_0.png => energy.png} | Bin common/buildcraft/BuildCraftCore.java | 18 ++++++++++ common/buildcraft/core/CoreIconProvider.java | 32 ++++++++++++++++++ common/buildcraft/energy/gui/GuiEngine.java | 11 +++--- .../gui/GuiAssemblyAdvancedWorkbench.java | 6 +++- .../silicon/gui/GuiAssemblyTable.java | 6 +++- 6 files changed, 65 insertions(+), 8 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/items/icons/{guiicons_0_0.png => energy.png} (100%) create mode 100644 common/buildcraft/core/CoreIconProvider.java diff --git a/buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_0.png b/buildcraft_resources/mods/buildcraft/textures/items/icons/energy.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/items/icons/guiicons_0_0.png rename to buildcraft_resources/mods/buildcraft/textures/items/icons/energy.png diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 9f19a24b..c342b888 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -19,6 +19,7 @@ import net.minecraft.entity.EntityList; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.Property; @@ -34,6 +35,7 @@ import buildcraft.core.DefaultProps; import buildcraft.core.EntityEnergyLaser; import buildcraft.core.EntityPowerLaser; import buildcraft.core.EntityRobot; +import buildcraft.core.CoreIconProvider; import buildcraft.core.ItemBuildCraft; import buildcraft.core.ItemWrench; import buildcraft.core.RedstonePowerFramework; @@ -77,6 +79,7 @@ import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ForgeSubscribe; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", dependencies = "required-after:Forge@[6.5.0.0,)") @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandler.class, clientSideRequired = true, serverSideRequired = true) @@ -124,6 +127,9 @@ public class BuildCraftCore { public static Icon stripesLaserTexture; @SideOnly(Side.CLIENT) public static Icon transparentTexture; + + @SideOnly(Side.CLIENT) + public static IIconProvider iconProvider; public static int blockByEntityModel; public static int legacyPipeModel; @@ -252,6 +258,9 @@ public class BuildCraftCore { diamondGearItem = (new ItemBuildCraft(diamondGearId.getInt())).setUnlocalizedName("diamondGearItem"); LanguageRegistry.addName(diamondGearItem, "Diamond Gear"); + + MinecraftForge.EVENT_BUS.register(this); + } finally { if (mainConfiguration.hasChanged()) { mainConfiguration.save(); @@ -307,6 +316,15 @@ public class BuildCraftCore { public void serverStarting(FMLServerStartingEvent event) { event.registerServerCommand(new CommandBuildCraft()); } + + @ForgeSubscribe + @SideOnly(Side.CLIENT) + public void textureHook(TextureStitchEvent.Pre event){ + if ("items".equals(event.map.field_94253_b)){ + iconProvider = new CoreIconProvider(); + iconProvider.registerIcons(event.map); + } + } public void loadRecipes() { GameRegistry.addRecipe(new ItemStack(wrenchItem), "I I", " G ", " I ", Character.valueOf('I'), Item.ingotIron, Character.valueOf('G'), stoneGearItem); diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java new file mode 100644 index 00000000..2140265e --- /dev/null +++ b/common/buildcraft/core/CoreIconProvider.java @@ -0,0 +1,32 @@ +package buildcraft.core; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.core.IIconProvider; + +public class CoreIconProvider implements IIconProvider { + + public static int ENERGY = 0; + + public static int MAX = 1; + + private Icon[] _icons; + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int iconIndex) { + return _icons[iconIndex]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + _icons = new Icon[MAX]; + + _icons[ENERGY] = iconRegister.func_94245_a("buildcraft:icons/energy"); + + } + +} diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index aa2a0929..8a92a2f3 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -1,10 +1,9 @@ package buildcraft.energy.gui; -import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; +import buildcraft.BuildCraftCore; +import buildcraft.core.CoreIconProvider; import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.utils.StringUtil; @@ -33,8 +32,8 @@ public abstract class GuiEngine extends GuiBuildCraft { drawBackground(x, y); // Draw icon - drawIcon(DefaultProps.TEXTURE_ICONS, 0, x + 3, y + 4); - //drawIcon(BuildCraftTransport.instance.wireIconProvider.getIcon(0), x + 3, y + 4); + Minecraft.getMinecraft().renderEngine.func_98187_b("/gui/items.png"); + drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4); if (!isFullyOpened()) return; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java index cdbca78a..4a20b5f7 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java @@ -1,5 +1,6 @@ package buildcraft.silicon.gui; +import net.minecraft.client.Minecraft; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -7,7 +8,9 @@ import net.minecraft.item.crafting.IRecipe; import org.lwjgl.opengl.GL11; +import buildcraft.BuildCraftCore; import buildcraft.core.DefaultProps; +import buildcraft.core.CoreIconProvider; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtil; import buildcraft.silicon.TileAssemblyAdvancedWorkbench; @@ -30,7 +33,8 @@ public class GuiAssemblyAdvancedWorkbench extends GuiAdvancedInterface { drawBackground(x, y); // Draw icon - drawIcon(DefaultProps.TEXTURE_ICONS, 0, x + 3, y + 4); + Minecraft.getMinecraft().renderEngine.func_98187_b("/gui/items.png"); + drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4); if (!isFullyOpened()) return; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 0192b6fd..51980ba3 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -12,13 +12,16 @@ package buildcraft.silicon.gui; import java.util.Iterator; import java.util.LinkedList; +import net.minecraft.client.Minecraft; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import buildcraft.BuildCraftCore; import buildcraft.api.recipes.AssemblyRecipe; import buildcraft.core.DefaultProps; +import buildcraft.core.CoreIconProvider; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; @@ -50,7 +53,8 @@ public class GuiAssemblyTable extends GuiAdvancedInterface { drawBackground(x, y); // Draw icon - drawIcon(DefaultProps.TEXTURE_ICONS, 0, x + 3, y + 4); + Minecraft.getMinecraft().renderEngine.func_98187_b("/gui/items.png"); + drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4); if (!isFullyOpened()) return; From 2e7368150ed3d955de020fbc5873e3ef6d8f8b25 Mon Sep 17 00:00:00 2001 From: aznhe21 Date: Fri, 22 Mar 2013 04:06:01 +0900 Subject: [PATCH 30/93] Fix mining wells not put two or more stacks in pipe --- common/buildcraft/factory/TileMiningWell.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index e531ca18..064c429b 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -78,7 +78,7 @@ public class TileMiningWell extends TileMachine implements IMachine, IPowerRecep } if (Utils.addToRandomPipeEntry(this, ForgeDirection.UNKNOWN, stack) && stack.stackSize <= 0) - return; + continue; // Throw the object away. // TODO: factorize that code From 2e9dbaa0f70a93c624560e4c618d94959513ab6e Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Thu, 21 Mar 2013 23:26:52 -0700 Subject: [PATCH 31/93] Break soft blocks before filling Closes #693 --- common/buildcraft/builders/FillerPattern.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/buildcraft/builders/FillerPattern.java b/common/buildcraft/builders/FillerPattern.java index a1ff7db2..02274a37 100644 --- a/common/buildcraft/builders/FillerPattern.java +++ b/common/buildcraft/builders/FillerPattern.java @@ -73,6 +73,7 @@ public abstract class FillerPattern implements IFillerPattern { } if (found && stackToPlace != null) { + BlockUtil.breakBlock(world, xSlot, ySlot, zSlot); stackToPlace.getItem().onItemUse(stackToPlace, CoreProxy.proxy.getBuildCraftPlayer(world), world, xSlot, ySlot - 1, zSlot, 1, 0.0f, 0.0f, 0.0f); } From 7280fa7165cbe1bcd55a731113b82cf37402ab9c Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Fri, 22 Mar 2013 19:45:10 +1300 Subject: [PATCH 32/93] Updated for obfuscations The field 94425 that I duplicated is a private field, and the names that someone has put as the deobfuscation name of the real one is a pile of crap so I will leave it as that till I or someone else can come up with a better one. --- common/buildcraft/energy/BlockOilFlowing.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index 839921ae..ce145e03 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -267,8 +267,8 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister iconRegister){ - this.field_94425_a = new Icon[] {iconRegister.func_94245_a("buildcraft:oil"), iconRegister.func_94245_a("buildcraft:oil_flow")}; + public void registerIcons(IconRegister iconRegister){ + this.field_94425_a = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; } @Override From 43227c6b3e5494c1060b76f7b4beb030e1911bd8 Mon Sep 17 00:00:00 2001 From: Vilim Lendvaj Date: Fri, 22 Mar 2013 19:46:33 +0100 Subject: [PATCH 33/93] Update to MC1.5.1 It's a 100% compiling, 100% working and 95% textured build for 1.5.1, MCForge build .600 --- build.xml | 6 +- buildcraft_resources/build.xml | 4 +- common/buildcraft/BuildCraftBuilders.java | 6 +- common/buildcraft/BuildCraftCore.java | 5 +- common/buildcraft/BuildCraftEnergy.java | 4 +- .../buildcraft/api/blueprints/BptBlock.java | 2 +- .../buildcraft/api/bptblocks/BptBlockBed.java | 4 +- .../api/bptblocks/BptBlockDirt.java | 2 +- .../api/bptblocks/BptBlockDoor.java | 4 +- .../api/bptblocks/BptBlockLiquid.java | 2 +- .../api/bptblocks/BptBlockPiston.java | 2 +- common/buildcraft/api/core/BuildCraftAPI.java | 2 +- .../buildcraft/builders/BlockArchitect.java | 12 ++-- .../builders/BlockBlueprintLibrary.java | 6 +- common/buildcraft/builders/BlockBuilder.java | 8 +-- common/buildcraft/builders/BlockFiller.java | 8 +-- common/buildcraft/builders/BlockMarker.java | 8 +-- .../buildcraft/builders/BlockPathMarker.java | 6 +- .../buildcraft/builders/BptBlockFiller.java | 2 +- .../builders/BuilderProxyClient.java | 14 ++-- common/buildcraft/builders/FillerPattern.java | 2 +- common/buildcraft/builders/ItemBptBase.java | 4 +- .../buildcraft/builders/ItemBptBluePrint.java | 6 +- .../buildcraft/builders/ItemBptTemplate.java | 6 +- common/buildcraft/builders/TileBuilder.java | 2 +- common/buildcraft/builders/TileMarker.java | 4 +- .../builders/gui/GuiBlueprintLibrary.java | 2 +- .../buildcraft/builders/gui/GuiBuilder.java | 4 +- common/buildcraft/builders/gui/GuiFiller.java | 4 +- .../buildcraft/builders/gui/GuiTemplate.java | 2 +- common/buildcraft/core/BlockSpring.java | 6 +- common/buildcraft/core/CoreIconProvider.java | 2 +- common/buildcraft/core/EntityRobot.java | 4 +- common/buildcraft/core/ItemBuildCraft.java | 4 +- .../buildcraft/core/ItemRedstoneChipset.java | 4 +- common/buildcraft/core/SpringPopulate.java | 6 +- common/buildcraft/core/TileBuildCraft.java | 4 +- .../core/gui/GuiAdvancedInterface.java | 2 +- common/buildcraft/core/gui/GuiBuildCraft.java | 4 +- .../core/proxy/CoreProxyClient.java | 10 +-- .../buildcraft/core/render/RenderLaser.java | 2 +- .../buildcraft/core/render/RenderRobot.java | 2 +- .../core/render/RenderingMarkers.java | 8 +-- .../triggers/ActionTriggerIconProvider.java | 62 ++++++++--------- common/buildcraft/core/utils/BlockUtil.java | 2 +- .../core/utils/SidedInventoryAdapter.java | 4 +- .../core/utils/SimpleInventory.java | 22 +++---- .../core/utils/SurroundingInventory.java | 4 +- common/buildcraft/energy/BlockEngine.java | 2 +- common/buildcraft/energy/BlockOilFlowing.java | 10 +-- common/buildcraft/energy/BlockPollution.java | 4 +- common/buildcraft/energy/BptBlockEngine.java | 2 +- common/buildcraft/energy/ItemBucketOil.java | 4 +- .../buildcraft/energy/OilBucketHandler.java | 2 +- common/buildcraft/energy/OilPopulate.java | 12 ++-- .../energy/gui/GuiCombustionEngine.java | 6 +- common/buildcraft/energy/gui/GuiEngine.java | 2 +- .../buildcraft/energy/gui/GuiSteamEngine.java | 2 +- .../factory/BlockAutoWorkbench.java | 6 +- common/buildcraft/factory/BlockFrame.java | 6 +- common/buildcraft/factory/BlockHopper.java | 4 +- .../buildcraft/factory/BlockMiningWell.java | 12 ++-- common/buildcraft/factory/BlockPlainPipe.java | 4 +- common/buildcraft/factory/BlockPump.java | 8 +-- common/buildcraft/factory/BlockQuarry.java | 8 +-- common/buildcraft/factory/BlockRefinery.java | 2 +- common/buildcraft/factory/BlockTank.java | 8 +-- common/buildcraft/factory/BptBlockTank.java | 2 +- .../factory/FactoryProxyClient.java | 8 +-- .../buildcraft/factory/TileAutoWorkbench.java | 4 +- common/buildcraft/factory/TileMiningWell.java | 2 +- common/buildcraft/factory/TilePump.java | 2 +- common/buildcraft/factory/TileQuarry.java | 2 +- .../factory/gui/GuiAutoCrafting.java | 2 +- common/buildcraft/factory/gui/GuiHopper.java | 2 +- .../buildcraft/factory/gui/GuiRefinery.java | 2 +- .../buildcraft/factory/render/RenderTank.java | 2 +- .../silicon/BlockAssemblyTable.java | 14 ++-- common/buildcraft/silicon/BlockLaser.java | 8 +-- .../TileAssemblyAdvancedWorkbench.java | 22 +++---- .../buildcraft/silicon/TileAssemblyTable.java | 4 +- .../gui/GuiAssemblyAdvancedWorkbench.java | 4 +- .../silicon/gui/GuiAssemblyTable.java | 4 +- .../transport/BlockGenericPipe.java | 4 +- .../transport/GateIconProvider.java | 56 ++++++++-------- common/buildcraft/transport/ItemFacade.java | 4 +- common/buildcraft/transport/ItemGate.java | 30 ++++----- common/buildcraft/transport/ItemPipe.java | 4 +- .../transport/PipeIconProvider.java | 66 +++++++++---------- .../transport/PipeTransportPower.java | 2 +- .../buildcraft/transport/TileGenericPipe.java | 2 +- .../transport/WireIconProvider.java | 16 ++--- .../transport/gui/GuiDiamondPipe.java | 2 +- .../transport/gui/GuiEmeraldPipe.java | 2 +- .../transport/gui/GuiGateInterface.java | 6 +- .../transport/pipes/PipeItemsEmerald.java | 22 +++---- .../transport/pipes/PipeLogicDiamond.java | 4 +- 97 files changed, 350 insertions(+), 353 deletions(-) diff --git a/build.xml b/build.xml index b42fe22e..979dfd11 100644 --- a/build.xml +++ b/build.xml @@ -17,9 +17,9 @@ - - - + + + diff --git a/buildcraft_resources/build.xml b/buildcraft_resources/build.xml index 65fad00c..1ed2985f 100644 --- a/buildcraft_resources/build.xml +++ b/buildcraft_resources/build.xml @@ -16,8 +16,8 @@ - - + + diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index a3dc5306..c473d11c 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -184,11 +184,11 @@ public class BuildCraftBuilders { new BptBlockPumpkin(Block.pumpkinLantern.blockID); - new BptBlockStairs(Block.stairCompactCobblestone.blockID); - new BptBlockStairs(Block.stairCompactPlanks.blockID); + new BptBlockStairs(Block.stairsCobblestone.blockID); + new BptBlockStairs(Block.stairsWoodOak.blockID); new BptBlockStairs(Block.stairsNetherBrick.blockID); new BptBlockStairs(Block.stairsBrick.blockID); - new BptBlockStairs(Block.stairsStoneBrickSmooth.blockID); + new BptBlockStairs(Block.stairsStoneBrick.blockID); new BptBlockDoor(Block.doorWood.blockID, new ItemStack(Item.doorWood)); new BptBlockDoor(Block.doorSteel.blockID, new ItemStack(Item.doorSteel)); diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index c342b888..363ed1a9 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -320,10 +320,11 @@ public class BuildCraftCore { @ForgeSubscribe @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Pre event){ - if ("items".equals(event.map.field_94253_b)){ + //if ("items".equals(event.map.field_94253_b)){ iconProvider = new CoreIconProvider(); iconProvider.registerIcons(event.map); - } + //} + //TODO: this needs un-privating in TextureMap } public void loadRecipes() { diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index c00b61f3..0233570e 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -199,7 +199,7 @@ public class BuildCraftEnergy { // int z = toPollute.k; // // if (world.getBlockId(x, y, z) == 0) { - // world.setBlockAndMetadataWithNotify(x, y, z, + // world.setBlock(x, y, z, // BuildCraftEnergy.pollution.blockID, // saturation * 16 / 100); // @@ -215,7 +215,7 @@ public class BuildCraftEnergy { // if (remainingSaturation > 0) { // if (world.getBlockId(i, j + 1, k) == 0) { // if (j + 1 < 128) { - // world.setBlockAndMetadataWithNotify(i, j + 1, k, + // world.setBlock(i, j + 1, k, // BuildCraftEnergy.pollution.blockID, // saturation * 16 / 100); // saturationStored.put(new BlockIndex(i, j + 1, k), diff --git a/common/buildcraft/api/blueprints/BptBlock.java b/common/buildcraft/api/blueprints/BptBlock.java index d90c9105..ada58389 100644 --- a/common/buildcraft/api/blueprints/BptBlock.java +++ b/common/buildcraft/api/blueprints/BptBlock.java @@ -131,7 +131,7 @@ public class BptBlock { */ public void buildBlock(BptSlotInfo slot, IBptContext context) { // Meta needs to be specified twice, depending on the block behavior - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,1); if (Block.blocksList[slot.blockId] instanceof BlockContainer) { diff --git a/common/buildcraft/api/bptblocks/BptBlockBed.java b/common/buildcraft/api/bptblocks/BptBlockBed.java index 27372640..8a40b98d 100644 --- a/common/buildcraft/api/bptblocks/BptBlockBed.java +++ b/common/buildcraft/api/bptblocks/BptBlockBed.java @@ -56,7 +56,7 @@ public class BptBlockBed extends BptBlock { if ((slot.meta & 8) != 0) return; - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); int x2 = slot.x; int z2 = slot.z; @@ -76,7 +76,7 @@ public class BptBlockBed extends BptBlock { break; } - context.world().setBlockAndMetadataWithNotify(x2, slot.y, z2, slot.blockId, slot.meta + 8,1); + context.world().setBlock(x2, slot.y, z2, slot.blockId, slot.meta + 8,1); } @Override diff --git a/common/buildcraft/api/bptblocks/BptBlockDirt.java b/common/buildcraft/api/bptblocks/BptBlockDirt.java index ad550dd4..35f32cdd 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDirt.java +++ b/common/buildcraft/api/bptblocks/BptBlockDirt.java @@ -30,7 +30,7 @@ public class BptBlockDirt extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, Block.dirt.blockID, slot.meta,1); + context.world().setBlock(slot.x, slot.y, slot.z, Block.dirt.blockID, slot.meta,1); } @Override diff --git a/common/buildcraft/api/bptblocks/BptBlockDoor.java b/common/buildcraft/api/bptblocks/BptBlockDoor.java index ffe02249..242cef22 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDoor.java +++ b/common/buildcraft/api/bptblocks/BptBlockDoor.java @@ -61,8 +61,8 @@ public class BptBlockDoor extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y + 1, slot.z, slot.blockId, slot.meta + 8,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); + context.world().setBlock(slot.x, slot.y + 1, slot.z, slot.blockId, slot.meta + 8,1); context.world().setBlockMetadataWithNotify(slot.x, slot.y + 1, slot.z, slot.meta + 8,1); context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,1); diff --git a/common/buildcraft/api/bptblocks/BptBlockLiquid.java b/common/buildcraft/api/bptblocks/BptBlockLiquid.java index f29a66d7..e94ee150 100644 --- a/common/buildcraft/api/bptblocks/BptBlockLiquid.java +++ b/common/buildcraft/api/bptblocks/BptBlockLiquid.java @@ -54,7 +54,7 @@ public class BptBlockLiquid extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { if (slot.meta == 0) { - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, 0,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, 0,1); } } diff --git a/common/buildcraft/api/bptblocks/BptBlockPiston.java b/common/buildcraft/api/bptblocks/BptBlockPiston.java index 46e87e29..391f42d3 100644 --- a/common/buildcraft/api/bptblocks/BptBlockPiston.java +++ b/common/buildcraft/api/bptblocks/BptBlockPiston.java @@ -22,7 +22,7 @@ public class BptBlockPiston extends BptBlockRotateMeta { public void buildBlock(BptSlotInfo slot, IBptContext context) { int meta = slot.meta & 7; - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, meta,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, meta,1); } } diff --git a/common/buildcraft/api/core/BuildCraftAPI.java b/common/buildcraft/api/core/BuildCraftAPI.java index 3435d6af..5fe928bf 100644 --- a/common/buildcraft/api/core/BuildCraftAPI.java +++ b/common/buildcraft/api/core/BuildCraftAPI.java @@ -43,6 +43,6 @@ public class BuildCraftAPI { Block.blocksList[blockId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); } - world.func_94575_c(x, y, z, 0); + world.setBlock(x, y, z, 0); } } diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 6a4c8ba9..5f106b8d 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -143,12 +143,12 @@ public class BlockArchitect extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - blockTextureSides = par1IconRegister.func_94245_a("buildcraft:architect_sides"); - blockTextureTopNeg = par1IconRegister.func_94245_a("buildcraft:architect_top_neg"); - blockTextureTopPos = par1IconRegister.func_94245_a("buildcraft:architect_top_pos"); - blockTextureTopArchitect = par1IconRegister.func_94245_a("buildcraft:architect_top"); - blockTextureFront = par1IconRegister.func_94245_a("buildcraft:architect_front"); + blockTextureSides = par1IconRegister.registerIcons("buildcraft:architect_sides"); + blockTextureTopNeg = par1IconRegister.registerIcons("buildcraft:architect_top_neg"); + blockTextureTopPos = par1IconRegister.registerIcons("buildcraft:architect_top_pos"); + blockTextureTopArchitect = par1IconRegister.registerIcons("buildcraft:architect_top"); + blockTextureFront = par1IconRegister.registerIcons("buildcraft:architect_front"); } } diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index d36a5a95..a0f49cdb 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -90,9 +90,9 @@ public class BlockBlueprintLibrary extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.func_94245_a("buildcraft:library_topbottom"); - textureSide = par1IconRegister.func_94245_a("buildcraft:library_side"); + textureTop = par1IconRegister.registerIcons("buildcraft:library_topbottom"); + textureSide = par1IconRegister.registerIcons("buildcraft:library_side"); } } diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index a1176956..07e79d51 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -130,10 +130,10 @@ public class BlockBuilder extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - blockTextureTop = par1IconRegister.func_94245_a("buildcraft:builder_top"); - blockTextureSide = par1IconRegister.func_94245_a("buildcraft:builder_side"); - blockTextureFront = par1IconRegister.func_94245_a("buildcraft:builder_front"); + blockTextureTop = par1IconRegister.registerIcons("buildcraft:builder_top"); + blockTextureSide = par1IconRegister.registerIcons("buildcraft:builder_side"); + blockTextureFront = par1IconRegister.registerIcons("buildcraft:builder_front"); } } diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 83c466a1..6ea21900 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -111,10 +111,10 @@ public class BlockFiller extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - textureTopOn = par1IconRegister.func_94245_a("buildcraft:blockFillerTopOn"); - textureTopOff = par1IconRegister.func_94245_a("buildcraft:blockFillerTopOff"); - textureSides = par1IconRegister.func_94245_a("buildcraft:blockFillerSides"); + textureTopOn = par1IconRegister.registerIcons("buildcraft:blockFillerTopOn"); + textureTopOff = par1IconRegister.registerIcons("buildcraft:blockFillerTopOff"); + textureSides = par1IconRegister.registerIcons("buildcraft:blockFillerSides"); } } diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index 0f131eb1..d1734dae 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -132,7 +132,7 @@ public class BlockMarker extends BlockContainer { } if (flag) { dropBlockAsItem(world, i, j, k, BuildCraftBuilders.markerBlock.blockID, 0); - world.func_94575_c(i, j, k, 0); + world.setBlock(i, j, k, 0); } } } @@ -208,7 +208,7 @@ public class BlockMarker extends BlockContainer { private boolean dropTorchIfCantStay(World world, int i, int j, int k) { if (!canPlaceBlockAt(world, i, j, k)) { dropBlockAsItem(world, i, j, k, BuildCraftBuilders.markerBlock.blockID, 0); - world.func_94575_c(i, j, k, 0); + world.setBlock(i, j, k, 0); return false; } else return true; @@ -222,8 +222,8 @@ public class BlockMarker extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.func_94245_a("buildcraft:blockMarker"); + par1IconRegister.registerIcons("buildcraft:blockMarker"); } } diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index aac5d2cf..5c91010a 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -60,9 +60,9 @@ public class BlockPathMarker extends BlockMarker { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - field_94336_cN = par1IconRegister.func_94245_a("buildcraft:blockPathMarker"); - activeMarker = par1IconRegister.func_94245_a("buildcraft:blockPathMarkerActive"); + blockIcon = par1IconRegister.registerIcons("buildcraft:blockPathMarker"); + activeMarker = par1IconRegister.registerIcons("buildcraft:blockPathMarkerActive"); } } diff --git a/common/buildcraft/builders/BptBlockFiller.java b/common/buildcraft/builders/BptBlockFiller.java index 82ba873f..f199108e 100644 --- a/common/buildcraft/builders/BptBlockFiller.java +++ b/common/buildcraft/builders/BptBlockFiller.java @@ -69,7 +69,7 @@ public class BptBlockFiller extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { - context.world().func_94575_c(slot.x, slot.y, slot.z, slot.blockId); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId); TileFiller filler = (TileFiller) context.world().getBlockTileEntity(slot.x, slot.y, slot.z); diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 34d97baf..1f08204c 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -15,13 +15,13 @@ public class BuilderProxyClient extends BuilderProxy { public void initializeTextures() { - TextureMap terrainMap = Minecraft.getMinecraft().renderEngine.field_94154_l; - fillerFillAllTexture = terrainMap.func_94245_a("buildcraft:fillerPatterns/fillAll"); - fillerClearTexture = terrainMap.func_94245_a("buildcraft:fillerPatterns/clear"); - fillerWallsTexture = terrainMap.func_94245_a("buildcraft:fillerPatterns/walls"); - fillerStairsTexture = terrainMap.func_94245_a("buildcraft:fillerPatterns/stairs"); - fillerFlattenTexture = terrainMap.func_94245_a("buildcraft:fillerPatterns/flatten"); - fillerPyramidTexture = terrainMap.func_94245_a("buildcraft:fillerPatterns/pyramid"); + TextureMap terrainMap = Minecraft.getMinecraft().renderEngine.textureMapItems; + fillerFillAllTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/fillAll"); + fillerClearTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/clear"); + fillerWallsTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/walls"); + fillerStairsTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/stairs"); + fillerFlattenTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/flatten"); + fillerPyramidTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/pyramid"); } @Override public void registerClientHook() { diff --git a/common/buildcraft/builders/FillerPattern.java b/common/buildcraft/builders/FillerPattern.java index a1ff7db2..efd876cf 100644 --- a/common/buildcraft/builders/FillerPattern.java +++ b/common/buildcraft/builders/FillerPattern.java @@ -111,7 +111,7 @@ public abstract class FillerPattern implements IFillerPattern { if (lastX != Integer.MAX_VALUE) { if (BuildCraftBuilders.fillerDestroy) { - world.func_94575_c(lastX, lastY, lastZ, 0); + world.setBlock(lastX, lastY, lastZ, 0); } else { BlockUtil.breakBlock(world, lastX, lastY, lastZ, 20); } diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index 7b980722..419c4ecb 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -63,8 +63,8 @@ public abstract class ItemBptBase extends ItemBuildCraft { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { - par1IconRegister.func_94245_a("buildcraft:template_clean"); + par1IconRegister.registerIcons("buildcraft:template_clean"); } } diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java index 5a66496d..943cb5b2 100644 --- a/common/buildcraft/builders/ItemBptBluePrint.java +++ b/common/buildcraft/builders/ItemBptBluePrint.java @@ -33,9 +33,9 @@ public class ItemBptBluePrint extends ItemBptBase { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { - cleanBlueprint = par1IconRegister.func_94245_a("buildcraft:blueprint_clean"); - usedBlueprint = par1IconRegister.func_94245_a("buildcraft:blueprint_used"); + cleanBlueprint = par1IconRegister.registerIcons("buildcraft:blueprint_clean"); + usedBlueprint = par1IconRegister.registerIcons("buildcraft:blueprint_used"); } } diff --git a/common/buildcraft/builders/ItemBptTemplate.java b/common/buildcraft/builders/ItemBptTemplate.java index 380a6f99..56f958b1 100644 --- a/common/buildcraft/builders/ItemBptTemplate.java +++ b/common/buildcraft/builders/ItemBptTemplate.java @@ -21,9 +21,9 @@ public class ItemBptTemplate extends ItemBptBase { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { - super.func_94581_a(par1IconRegister); - par1IconRegister.func_94245_a("buildcraft:template_used"); + super.updateIcons(par1IconRegister); + par1IconRegister.registerIcons("buildcraft:template_used"); } } diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index b10b9e4a..e193b149 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -197,7 +197,7 @@ public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IP path = ((TilePathMarker) tile).getPath(); for (BlockIndex b : path) { - worldObj.func_94575_c(b.i, b.j, b.k, 0); + worldObj.setBlock(b.i, b.j, b.k, 0); BuildCraftBuilders.pathMarkerBlock.dropBlockAsItem(worldObj, b.i, b.j, b.k, BuildCraftBuilders.pathMarkerBlock.blockID, 0); } diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index 468b2eb6..31933e14 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -404,13 +404,13 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider { for (TileWrapper m : o.vect.clone()) { if (m.isSet()) { - worldObj.func_94575_c(m.x, m.y, m.z, 0); + worldObj.setBlock(m.x, m.y, m.z, 0); BuildCraftBuilders.markerBlock.dropBlockAsItem(worldObj, m.x, m.y, m.z, BuildCraftBuilders.markerBlock.blockID, 0); } } - worldObj.func_94575_c(o.vectO.x, o.vectO.y, o.vectO.z, 0); + worldObj.setBlock(o.vectO.x, o.vectO.y, o.vectO.z, 0); BuildCraftBuilders.markerBlock.dropBlockAsItem(worldObj, o.vectO.x, o.vectO.y, o.vectO.z, BuildCraftBuilders.markerBlock.blockID, 0); } diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index 233588ed..d6ab7c05 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -111,7 +111,7 @@ public class GuiBlueprintLibrary extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/library_rw.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/library_rw.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index b85c3f39..bd84e21c 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -66,10 +66,10 @@ public class GuiBuilder extends GuiAdvancedInterface { int realXSize = 0; if (builder.isBuildingBlueprint()) { - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/builder_blueprint.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/builder_blueprint.png"); realXSize = 256; } else { - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/builder.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/builder.png"); realXSize = 176; } diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 795548ea..128233ee 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -47,12 +47,12 @@ public class GuiFiller extends GuiBuildCraft { protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/filler.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/filler.png"); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if (filler.currentPattern != null) { - func_94065_a(guiLeft + patternSymbolX, guiTop + patternSymbolY, filler.currentPattern.getTexture(), 16, 16); + drawTexturedModelRectFromIcon(guiLeft + patternSymbolX, guiTop + patternSymbolY, filler.currentPattern.getTexture(), 16, 16); } } diff --git a/common/buildcraft/builders/gui/GuiTemplate.java b/common/buildcraft/builders/gui/GuiTemplate.java index de7c77f7..7d032538 100644 --- a/common/buildcraft/builders/gui/GuiTemplate.java +++ b/common/buildcraft/builders/gui/GuiTemplate.java @@ -55,7 +55,7 @@ public class GuiTemplate extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/template_gui.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/template_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index 1306e99d..cfcf9757 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -37,13 +37,13 @@ public class BlockSpring extends Block { if(!world.isAirBlock(x, y + 1, z)) return; - world.func_94575_c(x, y + 1, z, Block.waterStill.blockID); + world.setBlock(x, y + 1, z, Block.waterStill.blockID); } @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - field_94336_cN = par1IconRegister.func_94245_a("water"); + blockIcon = par1IconRegister.registerIcons("water"); } } diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 2140265e..60df225b 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -25,7 +25,7 @@ public class CoreIconProvider implements IIconProvider { public void registerIcons(IconRegister iconRegister) { _icons = new Icon[MAX]; - _icons[ENERGY] = iconRegister.func_94245_a("buildcraft:icons/energy"); + _icons[ENERGY] = iconRegister.registerIcons("buildcraft:icons/energy"); } diff --git a/common/buildcraft/core/EntityRobot.java b/common/buildcraft/core/EntityRobot.java index a3e562c0..f33845b0 100644 --- a/common/buildcraft/core/EntityRobot.java +++ b/common/buildcraft/core/EntityRobot.java @@ -214,12 +214,12 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData { if (target.mode == Mode.ClearIfInvalid) { if (!target.isValid(a.context)) { - worldObj.setBlockAndMetadataWithNotify(target.x, target.y, target.z, 0, 0,1); + worldObj.setBlock(target.x, target.y, target.z, 0, 0,1); } } else if (target.stackToUse != null) { - worldObj.func_94575_c(target.x, target.y, target.z, 0); + worldObj.setBlock(target.x, target.y, target.z, 0); throw new RuntimeErrorException(null, "NOT IMPLEMENTED"); // target.stackToUse.getItem().onItemUse(target.stackToUse, // CoreProxy.getBuildCraftPlayer(worldObj), worldObj, target.x, target.y - 1, diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index e04a63e1..5bc04aaa 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -37,8 +37,8 @@ public class ItemBuildCraft extends Item { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { - this.iconIndex = par1IconRegister.func_94245_a("buildcraft:" + iconName); + this.iconIndex = par1IconRegister.registerIcons("buildcraft:" + iconName); } } diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index cad9f5ca..25e6ab8c 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -44,12 +44,12 @@ public class ItemRedstoneChipset extends ItemBuildCraft { private static String[] chipsetNames = { "redstone_red", "redstone_iron", "redstone_gold", "redstone_diamond", "redstone_pulsating" }; @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { icons = new Icon[chipsetNames.length]; int i = 0; for (String csName : chipsetNames) { - icons[i++] = par1IconRegister.func_94245_a("buildcraft:"+csName+"_chipset"); + icons[i++] = par1IconRegister.registerIcons("buildcraft:"+csName+"_chipset"); } } } diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index b9bf5a0a..9ef30faa 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -55,11 +55,11 @@ public class SpringPopulate { if(candidate != Block.bedrock.blockID) continue; - world.func_94575_c(posX, i + 1, posZ, BuildCraftCore.springBlock.blockID); + world.setBlock(posX, i + 1, posZ, BuildCraftCore.springBlock.blockID); for(int j = i + 2; j < world.getActualHeight() - 10; j++) { if(!boreToSurface(world, posX, j, posZ)) { if(world.isAirBlock(posX, j, posZ)) - world.func_94575_c(posX, j, posZ, Block.waterStill.blockID); + world.setBlock(posX, j, posZ, Block.waterStill.blockID); break; } } @@ -78,7 +78,7 @@ public class SpringPopulate { && existing != Block.grass.blockID) return false; - world.func_94575_c(x, y, z, Block.waterStill.blockID); + world.setBlock(x, y, z, Block.waterStill.blockID); return true; } } diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index 2bf554ec..70457a24 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -114,13 +114,13 @@ public abstract class TileBuildCraft extends TileEntity implements ISynchronized } - public boolean func_94042_c() + public boolean isInvNameLocalized() { // TODO Auto-generated method stub return false; } - public boolean func_94041_b(int i, ItemStack itemstack) + public boolean isStackValidForSlot(int i, ItemStack itemstack) { // TODO Auto-generated method stub return false; diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index 7bcea412..2fd8f452 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -45,7 +45,7 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { if (getItemStack() != null) { drawStack(getItemStack()); } else if (getTexture() != null) { - func_94065_a(cornerX + x, cornerY + y, getTexture(), 16, 16); + drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getTexture(), 16, 16); } } diff --git a/common/buildcraft/core/gui/GuiBuildCraft.java b/common/buildcraft/core/gui/GuiBuildCraft.java index 66b8096f..c5403bc3 100644 --- a/common/buildcraft/core/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/gui/GuiBuildCraft.java @@ -205,7 +205,7 @@ public abstract class GuiBuildCraft extends GuiContainer { GL11.glColor4f(colorR, colorG, colorB, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/ledger.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/ledger.png"); drawTexturedModalRect(x, y, 0, 256 - currentHeight, 4, currentHeight); drawTexturedModalRect(x + 4, y, 256 - currentWidth + 4, 0, currentWidth - 4, 4); // Add in top left corner again @@ -219,7 +219,7 @@ public abstract class GuiBuildCraft extends GuiContainer { protected void drawIcon(Icon icon, int x, int y) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); - func_94065_a(x, y, icon, 16, 16); + drawTexturedModelRectFromIcon(x, y, icon, 16, 16); } } diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 567246c7..ef75ee27 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -118,11 +118,11 @@ public class CoreProxyClient extends CoreProxy { RenderingRegistry.registerBlockHandler(new RenderingOil()); RenderingRegistry.registerBlockHandler(new RenderingMarkers()); - TextureMap blockTextureMap = Minecraft.getMinecraft().renderEngine.field_94154_l; - BuildCraftCore.redLaserTexture = blockTextureMap.func_94245_a("buildcraft:blockRedLaser"); - BuildCraftCore.blueLaserTexture = blockTextureMap.func_94245_a("buildcraft:blockBlueLaser"); - BuildCraftCore.stripesLaserTexture = blockTextureMap.func_94245_a("buildcraft:blockStripesLaser"); - BuildCraftCore.transparentTexture = blockTextureMap.func_94245_a("buildcraft:blockTransparentLaser"); + TextureMap blockTextureMap = Minecraft.getMinecraft().renderEngine.textureMapItems; + BuildCraftCore.redLaserTexture = blockTextureMap.registerIcons("buildcraft:blockRedLaser"); + BuildCraftCore.blueLaserTexture = blockTextureMap.registerIcons("buildcraft:blockBlueLaser"); + BuildCraftCore.stripesLaserTexture = blockTextureMap.registerIcons("buildcraft:blockStripesLaser"); + BuildCraftCore.transparentTexture = blockTextureMap.registerIcons("buildcraft:blockTransparentLaser"); } @Override diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index f5cc8815..c7ff3b38 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -47,7 +47,7 @@ public class RenderLaser extends Render { GL11.glRotatef((float) laser.angleZ, 0, 1, 0); GL11.glRotatef((float) laser.angleY, 0, 0, 1); - renderManager.renderEngine.func_98187_b(laser.getTexture()); + renderManager.renderEngine.bindTexture(laser.getTexture()); float factor = (float) (1.0 / 16.0); diff --git a/common/buildcraft/core/render/RenderRobot.java b/common/buildcraft/core/render/RenderRobot.java index f2887a12..d191fe1a 100644 --- a/common/buildcraft/core/render/RenderRobot.java +++ b/common/buildcraft/core/render/RenderRobot.java @@ -36,7 +36,7 @@ public class RenderRobot extends Render { GL11.glDisable(2896 /* GL_LIGHTING */); GL11.glTranslated(x, y, z); - renderManager.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_ENTITIES + "/robot.png"); + renderManager.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_ENTITIES + "/robot.png"); float factor = (float) (1.0 / 16.0); diff --git a/common/buildcraft/core/render/RenderingMarkers.java b/common/buildcraft/core/render/RenderingMarkers.java index 1a316a35..79757fcc 100644 --- a/common/buildcraft/core/render/RenderingMarkers.java +++ b/common/buildcraft/core/render/RenderingMarkers.java @@ -120,8 +120,8 @@ public class RenderingMarkers implements ISimpleBlockRenderingHandler { Icon i = block.getBlockTexture(iblockaccess, xCoord, yCoord, zCoord, 1); int m = meta; - int j = i.func_94211_a(); - int k = i.func_94216_b(); + int j = i.getOriginX(); + int k = i.getOriginY(); float f = j / 256F; float f1 = (j + 15.99F) / 256F; float f2 = k / 256F; @@ -171,8 +171,8 @@ public class RenderingMarkers implements ISimpleBlockRenderingHandler { i = block.getBlockTexture(iblockaccess, xCoord, yCoord, zCoord, 0); - j = i.func_94211_a(); - k = i.func_94216_b(); + j = i.getOriginX(); + k = i.getOriginY(); f = j / 256F; f1 = (j + 15.99F) / 256F; f2 = k / 256F; diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index a7cff883..1624d479 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -62,38 +62,38 @@ public class ActionTriggerIconProvider implements IIconProvider { registered = true; icons = new Icon[MAX]; - icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.func_94245_a("buildcraft:triggers/action_machinecontrol_on"); - icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.func_94245_a("buildcraft:triggers/action_machinecontrol_off"); - icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.func_94245_a("buildcraft:triggers/action_machinecontrol_loop"); + icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_on"); + icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_off"); + icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_loop"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_blue"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_green"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_yellow"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Red] = iconRegister.func_94245_a("buildcraft:triggers/trigger_engineheat_red"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Empty] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_empty"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Contains] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_contains"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Space] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_space"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Full] = iconRegister.func_94245_a("buildcraft:triggers/trigger_inventory_full"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Empty] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_empty"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Contains] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_contains"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Space] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_space"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Full] = iconRegister.func_94245_a("buildcraft:triggers/trigger_liquidcontainer_full"); - icons[ActionTriggerIconProvider.Trigger_Machine_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_machine_active"); - icons[ActionTriggerIconProvider.Trigger_Machine_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_machine_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_Empty] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_empty"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsitems"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsliquid"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipecontents_containsenergy"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_red_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_blue_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_green_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); - icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.func_94245_a("buildcraft:triggers/trigger_redstoneinput_active"); - icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.func_94245_a("buildcraft:triggers/trigger_redstoneinput_inactive"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_blue"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_green"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_yellow"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Red] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_red"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_empty"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Contains] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_contains"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Space] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_space"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Full] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_full"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_empty"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Contains] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_contains"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Space] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_space"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Full] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_full"); + icons[ActionTriggerIconProvider.Trigger_Machine_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_machine_active"); + icons[ActionTriggerIconProvider.Trigger_Machine_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_machine_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_empty"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsitems"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsliquid"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsenergy"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_red_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_red_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_blue_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_blue_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_green_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_green_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_yellow_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_redstoneinput_active"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_redstoneinput_inactive"); } diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java index e4b286d8..12cbe5c3 100644 --- a/common/buildcraft/core/utils/BlockUtil.java +++ b/common/buildcraft/core/utils/BlockUtil.java @@ -61,7 +61,7 @@ public class BlockUtil { } } - world.func_94575_c(x, y, z, 0); + world.setBlock(x, y, z, 0); } public static boolean canChangeBlock(World world, int x, int y, int z) { diff --git a/common/buildcraft/core/utils/SidedInventoryAdapter.java b/common/buildcraft/core/utils/SidedInventoryAdapter.java index a8f63a88..3f42ee75 100644 --- a/common/buildcraft/core/utils/SidedInventoryAdapter.java +++ b/common/buildcraft/core/utils/SidedInventoryAdapter.java @@ -80,14 +80,14 @@ public class SidedInventoryAdapter implements IInventory { } @Override - public boolean func_94042_c() + public boolean isInvNameLocalized() { // TODO Auto-generated method stub return false; } @Override - public boolean func_94041_b(int i, ItemStack itemstack) + public boolean isStackValidForSlot(int i, ItemStack itemstack) { // TODO Auto-generated method stub return false; diff --git a/common/buildcraft/core/utils/SimpleInventory.java b/common/buildcraft/core/utils/SimpleInventory.java index 0aedddb4..c154ac24 100644 --- a/common/buildcraft/core/utils/SimpleInventory.java +++ b/common/buildcraft/core/utils/SimpleInventory.java @@ -138,17 +138,15 @@ public class SimpleInventory implements IInventory, INBTTagable { return _contents; } - @Override - public boolean func_94042_c() - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInvNameLocalized() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean func_94041_b(int i, ItemStack itemstack) - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isStackValidForSlot(int i, ItemStack itemstack) { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/core/utils/SurroundingInventory.java b/common/buildcraft/core/utils/SurroundingInventory.java index 9e5c330a..15b24a0d 100644 --- a/common/buildcraft/core/utils/SurroundingInventory.java +++ b/common/buildcraft/core/utils/SurroundingInventory.java @@ -177,14 +177,14 @@ public class SurroundingInventory implements IInventory, IBuilderInventory { } @Override - public boolean func_94042_c() + public boolean isInvNameLocalized() { // TODO Auto-generated method stub return false; } @Override - public boolean func_94041_b(int i, ItemStack itemstack) + public boolean isStackValidForSlot(int i, ItemStack itemstack) { // TODO Auto-generated method stub return false; diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 75f56ca1..5c690db0 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -55,7 +55,7 @@ public class BlockEngine extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { // NOOP } diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index 11f29ae4..b1fc5449 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -40,7 +40,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { private void updateFlow(World world, int i, int j, int k) { int l = world.getBlockMetadata(i, j, k); - world.setBlockAndMetadataWithNotify(i, j, k, blockID + 1, l, 1); + world.setBlock(i, j, k, blockID + 1, l, 1); world.markBlockRangeForRenderUpdate(i, j, k, i, j, k); world.markBlockForUpdate(i, j, k); } @@ -72,7 +72,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { if (j1 != l) { l = j1; if (l < 0) { - world.func_94575_c(i, j, k, 0); + world.setBlock(i, j, k, 0); } else { world.setBlockMetadataWithNotify(i, j, k, l,1); world.scheduleBlockUpdate(i, j, k, blockID, tickRate(world)); @@ -86,9 +86,9 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { } if (liquidCanDisplaceBlock(world, i, j - 1, k)) { if (l >= 8) { - world.setBlockAndMetadataWithNotify(i, j - 1, k, blockID, l,1); + world.setBlock(i, j - 1, k, blockID, l,1); } else { - world.setBlockAndMetadataWithNotify(i, j - 1, k, blockID, l + 8,1); + world.setBlock(i, j - 1, k, blockID, l + 8,1); } } else if (l >= 0 && (l == 0 || blockBlocksFlow(world, i, j - 1, k))) { boolean aflag[] = getOptimalFlowDirections(world, i, j, k); @@ -119,7 +119,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { if (i1 > 0) { Block.blocksList[i1].dropBlockAsItem(world, i, j, k, world.getBlockMetadata(i, j, k), 0); } - world.setBlockAndMetadataWithNotify(i, j, k, blockID, l,1); + world.setBlock(i, j, k, blockID, l,1); } } diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index 1b614222..4e8d4be0 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -43,8 +43,8 @@ public class BlockPollution extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.func_94245_a("buildcraft:blockPollution"); + par1IconRegister.registerIcons("buildcraft:blockPollution"); } } diff --git a/common/buildcraft/energy/BptBlockEngine.java b/common/buildcraft/energy/BptBlockEngine.java index b9ee6cfe..452d314f 100644 --- a/common/buildcraft/energy/BptBlockEngine.java +++ b/common/buildcraft/energy/BptBlockEngine.java @@ -41,7 +41,7 @@ public class BptBlockEngine extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); TileEngine engine = (TileEngine) context.world().getBlockTileEntity(slot.x, slot.y, slot.z); diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java index 831041c1..cd215955 100644 --- a/common/buildcraft/energy/ItemBucketOil.java +++ b/common/buildcraft/energy/ItemBucketOil.java @@ -33,8 +33,8 @@ public class ItemBucketOil extends ItemBucket { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { - par1IconRegister.func_94245_a("buildcraft:oil_bucket"); + par1IconRegister.registerIcons("buildcraft:oil_bucket"); } } diff --git a/common/buildcraft/energy/OilBucketHandler.java b/common/buildcraft/energy/OilBucketHandler.java index 08a3ffa7..4cd9c400 100644 --- a/common/buildcraft/energy/OilBucketHandler.java +++ b/common/buildcraft/energy/OilBucketHandler.java @@ -38,7 +38,7 @@ public class OilBucketHandler { if ((blockID == BuildCraftEnergy.oilStill.blockID || blockID == BuildCraftEnergy.oilMoving.blockID) && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) { - world.func_94575_c(pos.blockX, pos.blockY, pos.blockZ, 0); + world.setBlock(pos.blockX, pos.blockY, pos.blockZ, 0); return new ItemStack(BuildCraftEnergy.bucketOil); } else diff --git a/common/buildcraft/energy/OilPopulate.java b/common/buildcraft/energy/OilPopulate.java index da19c638..3bcef8f6 100644 --- a/common/buildcraft/energy/OilPopulate.java +++ b/common/buildcraft/energy/OilPopulate.java @@ -92,7 +92,7 @@ public class OilPopulate { int d2 = bx * bx + by * by + bz * bz; if (d2 <= r2) { - world.func_94575_c(bx + cx, by + cy, bz + cz, BuildCraftEnergy.oilStill.blockID); + world.setBlock(bx + cx, by + cy, bz + cz, BuildCraftEnergy.oilStill.blockID); } } } @@ -121,11 +121,11 @@ public class OilPopulate { } for (int h = y + 1; h <= ymax; ++h) { - world.func_94575_c(cx, h, cz, BuildCraftEnergy.oilStill.blockID); + world.setBlock(cx, h, cz, BuildCraftEnergy.oilStill.blockID); } } else if (started) { - world.func_94575_c(cx, y, cz, BuildCraftEnergy.oilStill.blockID); + world.setBlock(cx, y, cz, BuildCraftEnergy.oilStill.blockID); } } @@ -176,12 +176,12 @@ public class OilPopulate { if (adjacentOil || force) { if (world.getBlockId(x, y, z) == Block.waterMoving.blockID || world.getBlockId(x, y, z) == Block.waterStill.blockID || isOil(world, x, y, z)) { - world.func_94575_c(x, y, z, BuildCraftEnergy.oilStill.blockID); + world.setBlock(x, y, z, BuildCraftEnergy.oilStill.blockID); } else { - world.func_94575_c(x, y, z, 0); + world.setBlock(x, y, z, 0); } - world.func_94575_c(x, y - 1, z, BuildCraftEnergy.oilStill.blockID); + world.setBlock(x, y - 1, z, BuildCraftEnergy.oilStill.blockID); } } } diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index 693fd9ad..0473f6a9 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -39,7 +39,7 @@ public class GuiCombustionEngine extends GuiEngine { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); @@ -74,7 +74,7 @@ public class GuiCombustionEngine extends GuiEngine { squaled = 0; } - func_94065_a(j + col, k + line + 58 - x - start, liquid.getRenderingIcon(), 16, 16 - (16 - x)); + drawTexturedModelRectFromIcon(j + col, k + line + 58 - x - start, liquid.getRenderingIcon(), 16, 16 - (16 - x)); start = start + 16; if (x == 0 || squaled == 0) { @@ -82,7 +82,7 @@ public class GuiCombustionEngine extends GuiEngine { } } - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/combustion_engine_gui.png"); drawTexturedModalRect(j + col, k + line, 176, 0, 16, 60); } } diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index 8a92a2f3..e23856f7 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -32,7 +32,7 @@ public abstract class GuiEngine extends GuiBuildCraft { drawBackground(x, y); // Draw icon - Minecraft.getMinecraft().renderEngine.func_98187_b("/gui/items.png"); + Minecraft.getMinecraft().renderEngine.bindTexture("/gui/items.png"); drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4); if (!isFullyOpened()) diff --git a/common/buildcraft/energy/gui/GuiSteamEngine.java b/common/buildcraft/energy/gui/GuiSteamEngine.java index 17a75b42..d988d954 100644 --- a/common/buildcraft/energy/gui/GuiSteamEngine.java +++ b/common/buildcraft/energy/gui/GuiSteamEngine.java @@ -34,7 +34,7 @@ public class GuiSteamEngine extends GuiEngine { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/steam_engine_gui.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/steam_engine_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index c2c9c315..f5825f23 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -77,9 +77,9 @@ public class BlockAutoWorkbench extends BlockBuildCraft { } @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - topTexture = par1IconRegister.func_94245_a("buildcraft:autoWorkbench_top"); - sideTexture = par1IconRegister.func_94245_a("buildcraft:autoWorkbench_side"); + topTexture = par1IconRegister.registerIcons("buildcraft:autoWorkbench_top"); + sideTexture = par1IconRegister.registerIcons("buildcraft:autoWorkbench_side"); } } diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index eb621250..37d5f27d 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -46,7 +46,7 @@ public class BlockFrame extends Block implements IFramePipeConnection { int meta = world.getBlockMetadata(i, j, k); if (meta == 1 && random.nextInt(10) > 5) { - world.func_94575_c(i, j, k, 0); + world.setBlock(i, j, k, 0); } } @@ -196,8 +196,8 @@ public class BlockFrame extends Block implements IFramePipeConnection { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.func_94245_a("buildcraft:blockFrame"); + par1IconRegister.registerIcons("buildcraft:blockFrame"); } } diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index 12412cc7..fe8d6f17 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -74,9 +74,9 @@ public class BlockHopper extends BlockBuildCraft { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { -// field_94336_cN = par1IconRegister.func_94245_a("buildcraft:hopper"); +// field_94336_cN = par1IconRegister.registerIcons("buildcraft:hopper"); } } diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index c22e5368..cb3ddb1d 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -72,7 +72,7 @@ public class BlockMiningWell extends BlockMachineRoot { if (pipeID != BuildCraftFactory.plainPipeBlock.blockID) { break; } - world.func_94575_c(x, depth, z, 0); + world.setBlock(x, depth, z, 0); } } @@ -89,11 +89,11 @@ public class BlockMiningWell extends BlockMachineRoot { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - textureFront = par1IconRegister.func_94245_a("buildcraft:miningwell_front"); - textureSides = par1IconRegister.func_94245_a("buildcraft:miningwell_side"); - textureBack = par1IconRegister.func_94245_a("buildcraft:miningwell_back"); - textureTop = par1IconRegister.func_94245_a("buildcraft:miningwell_top"); + textureFront = par1IconRegister.registerIcons("buildcraft:miningwell_front"); + textureSides = par1IconRegister.registerIcons("buildcraft:miningwell_side"); + textureBack = par1IconRegister.registerIcons("buildcraft:miningwell_back"); + textureTop = par1IconRegister.registerIcons("buildcraft:miningwell_top"); } } diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index 4e798f12..72cfd08c 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -75,8 +75,8 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.func_94245_a("buildcraft:blockPlainPipe"); + par1IconRegister.registerIcons("buildcraft:blockPlainPipe"); } } diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index 96a0e995..df41c381 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -68,10 +68,10 @@ public class BlockPump extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.func_94245_a("buildcraft:pump_top"); - textureBottom = par1IconRegister.func_94245_a("buildcraft:pump_bottom"); - textureSide = par1IconRegister.func_94245_a("buildcraft:pump_side"); + textureTop = par1IconRegister.registerIcons("buildcraft:pump_top"); + textureBottom = par1IconRegister.registerIcons("buildcraft:pump_bottom"); + textureSide = par1IconRegister.registerIcons("buildcraft:pump_side"); } } diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 7b53c2fc..494ed76d 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -225,10 +225,10 @@ public class BlockQuarry extends BlockMachineRoot { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - textureSide = par1IconRegister.func_94245_a("buildcraft:quarry_side"); - textureTop = par1IconRegister.func_94245_a("buildcraft:quarry_top"); - textureFront = par1IconRegister.func_94245_a("buildcraft:quarry_front"); + textureSide = par1IconRegister.registerIcons("buildcraft:quarry_side"); + textureTop = par1IconRegister.registerIcons("buildcraft:quarry_top"); + textureFront = par1IconRegister.registerIcons("buildcraft:quarry_front"); } } diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index 4fc1b9c1..9c0d8f01 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -137,7 +137,7 @@ public class BlockRefinery extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { // NOOP } diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 7aa6da4e..21f26944 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -137,11 +137,11 @@ public class BlockTank extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - textureStackedSide = par1IconRegister.func_94245_a("buildcraft:tank_stacked_side"); - textureBottomSide = par1IconRegister.func_94245_a("buildcraft:tank_bottom_side"); - textureTop = par1IconRegister.func_94245_a("buildcraft:tank_top"); + textureStackedSide = par1IconRegister.registerIcons("buildcraft:tank_stacked_side"); + textureBottomSide = par1IconRegister.registerIcons("buildcraft:tank_bottom_side"); + textureTop = par1IconRegister.registerIcons("buildcraft:tank_top"); } } diff --git a/common/buildcraft/factory/BptBlockTank.java b/common/buildcraft/factory/BptBlockTank.java index 3630d8dc..ec5e33dc 100644 --- a/common/buildcraft/factory/BptBlockTank.java +++ b/common/buildcraft/factory/BptBlockTank.java @@ -17,7 +17,7 @@ public class BptBlockTank extends BptBlock { @Override public void buildBlock(BptSlotInfo slot, IBptContext context) { - context.world().setBlockAndMetadataWithNotify(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); } } diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index f3df217b..e87845ef 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -42,10 +42,10 @@ public class FactoryProxyClient extends FactoryProxy { @Override public void initializeEntityRenders() { RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid()); - TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.field_94154_l; - pumpTexture = terrainTextures.func_94245_a("buildcraft:blockPumpTubeTexture"); - drillTexture = terrainTextures.func_94245_a("buildcraft:blockDrillTexture"); - drillHeadTexture = terrainTextures.func_94245_a("buildcraft:blockDrillHeadTexture"); + TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.textureMapItems; + pumpTexture = terrainTextures.registerIcons("buildcraft:blockPumpTubeTexture"); + drillTexture = terrainTextures.registerIcons("buildcraft:blockDrillTexture"); + drillHeadTexture = terrainTextures.registerIcons("buildcraft:blockDrillHeadTexture"); } @Override diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 8a134e07..7f3cc17e 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -408,14 +408,14 @@ public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { } @Override - public boolean func_94042_c() + public boolean isInvNameLocalized() { // TODO Auto-generated method stub return false; } @Override - public boolean func_94041_b(int i, ItemStack itemstack) + public boolean isStackValidForSlot(int i, ItemStack itemstack) { // TODO Auto-generated method stub return false; diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index e531ca18..3a359e4a 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -61,7 +61,7 @@ public class TileMiningWell extends TileMachine implements IMachine, IPowerRecep List stacks = BlockUtil.getItemStackFromBlock(worldObj, xCoord, depth, zCoord); - world.func_94575_c(xCoord, depth, zCoord, BuildCraftFactory.plainPipeBlock.blockID); + world.setBlock(xCoord, depth, zCoord, BuildCraftFactory.plainPipeBlock.blockID); if (blockId == 0) return; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index 1eba9d37..b3ad8813 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -90,7 +90,7 @@ public class TilePump extends TileMachine implements IMachine, IPowerReceptor, I index = getNextIndexToPump(true); if (liquidToPump.itemID != Block.waterStill.blockID || BuildCraftCore.consumeWaterSources) { - worldObj.func_94575_c(index.i, index.j, index.k, 0); + worldObj.setBlock(index.i, index.j, index.k, 0); } tank.fill(liquidToPump, true); diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index d3a1f4be..53389970 100755 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -417,7 +417,7 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor, } worldObj.playAuxSFXAtEntity(null, 2001, i, j, k, blockId + (worldObj.getBlockMetadata(i, j, k) << 12)); - worldObj.func_94575_c(i, j, k, 0); + worldObj.setBlock(i, j, k, 0); } // Collect any lost items laying around diff --git a/common/buildcraft/factory/gui/GuiAutoCrafting.java b/common/buildcraft/factory/gui/GuiAutoCrafting.java index 52926d88..14bb32e5 100644 --- a/common/buildcraft/factory/gui/GuiAutoCrafting.java +++ b/common/buildcraft/factory/gui/GuiAutoCrafting.java @@ -42,7 +42,7 @@ public class GuiAutoCrafting extends GuiBuildCraft { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b("/gui/crafting.png"); + mc.renderEngine.bindTexture("/gui/crafting.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/factory/gui/GuiHopper.java b/common/buildcraft/factory/gui/GuiHopper.java index 33199bc7..00659245 100644 --- a/common/buildcraft/factory/gui/GuiHopper.java +++ b/common/buildcraft/factory/gui/GuiHopper.java @@ -18,7 +18,7 @@ public class GuiHopper extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/hopper_gui.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index ffdba5d3..c2b913a0 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -55,7 +55,7 @@ public class GuiRefinery extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/refinery_filter.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index 8b643674..ae64d980 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -50,7 +50,7 @@ public class RenderTank extends TileEntitySpecialRenderer { BlockInterface block = new BlockInterface(); block.texture = liquid.getRenderingIcon(); - Minecraft.getMinecraft().renderEngine.func_98187_b("/terrain.png"); + Minecraft.getMinecraft().renderEngine.bindTexture("/terrain.png"); for (int s = 0; s < displayStages; ++s) { d[s] = GLAllocation.generateDisplayLists(1); diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index e836ea6a..1098f80b 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -96,16 +96,16 @@ public class BlockAssemblyTable extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { icons = new Icon[2][]; icons[0] = new Icon[3]; icons[1] = new Icon[3]; - icons[0][0] = par1IconRegister.func_94245_a("buildcraft:assemblytable_bottom"); - icons[1][0] = par1IconRegister.func_94245_a("buildcraft:advworkbenchtable_bottom"); - icons[0][1] = par1IconRegister.func_94245_a("buildcraft:assemblytable_top"); - icons[1][1] = par1IconRegister.func_94245_a("buildcraft:advworkbenchtable_top"); - icons[0][2] = par1IconRegister.func_94245_a("buildcraft:assemblytable_side"); - icons[1][2] = par1IconRegister.func_94245_a("buildcraft:advworkbenchtable_side"); + icons[0][0] = par1IconRegister.registerIcons("buildcraft:assemblytable_bottom"); + icons[1][0] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_bottom"); + icons[0][1] = par1IconRegister.registerIcons("buildcraft:assemblytable_top"); + icons[1][1] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_top"); + icons[0][2] = par1IconRegister.registerIcons("buildcraft:assemblytable_side"); + icons[1][2] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_side"); } } diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 30b36cfb..7bd84f3f 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -90,10 +90,10 @@ public class BlockLaser extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister par1IconRegister) + public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.func_94245_a("buildcraft:laser_top"); - textureBottom = par1IconRegister.func_94245_a("buildcraft:laser_bottom"); - textureSide = par1IconRegister.func_94245_a("buildcraft:laser_side"); + textureTop = par1IconRegister.registerIcons("buildcraft:laser_top"); + textureBottom = par1IconRegister.registerIcons("buildcraft:laser_bottom"); + textureSide = par1IconRegister.registerIcons("buildcraft:laser_side"); } } diff --git a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java index 92457ef6..04c8f17b 100644 --- a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java @@ -466,18 +466,16 @@ public class TileAssemblyAdvancedWorkbench extends TileEntity implements IInvent iCrafting.sendProgressBarUpdate(container, 5, (lRecentEnergy >>> 16) & 0xFFFF); } - @Override - public boolean func_94042_c() - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInvNameLocalized() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean func_94041_b(int i, ItemStack itemstack) - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isStackValidForSlot(int i, ItemStack itemstack) { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index 770c0ddb..a5bbe29c 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -494,14 +494,14 @@ public class TileAssemblyTable extends TileEntity implements IMachine, IInventor } @Override - public boolean func_94042_c() + public boolean isInvNameLocalized() { // TODO Auto-generated method stub return false; } @Override - public boolean func_94041_b(int i, ItemStack itemstack) + public boolean isStackValidForSlot(int i, ItemStack itemstack) { // TODO Auto-generated method stub return false; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java index 4a20b5f7..2d694495 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java @@ -33,7 +33,7 @@ public class GuiAssemblyAdvancedWorkbench extends GuiAdvancedInterface { drawBackground(x, y); // Draw icon - Minecraft.getMinecraft().renderEngine.func_98187_b("/gui/items.png"); + Minecraft.getMinecraft().renderEngine.bindTexture("/gui/items.png"); drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4); if (!isFullyOpened()) @@ -102,7 +102,7 @@ public class GuiAssemblyAdvancedWorkbench extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/assembly_advancedworkbench.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/assembly_advancedworkbench.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 51980ba3..0afe8355 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -53,7 +53,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface { drawBackground(x, y); // Draw icon - Minecraft.getMinecraft().renderEngine.func_98187_b("/gui/items.png"); + Minecraft.getMinecraft().renderEngine.bindTexture("/gui/items.png"); drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4); if (!isFullyOpened()) @@ -144,7 +144,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/assembly_table.png"); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index acf9a9c1..b6f87d5e 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -852,7 +852,7 @@ public class BlockGenericPipe extends BlockContainer { if (world.isRemote) return true; - boolean placed = world.setBlockAndMetadataWithNotify(i, j, k, blockId, meta,1); + boolean placed = world.setBlock(i, j, k, blockId, meta, 1); if (placed) { @@ -883,7 +883,7 @@ public class BlockGenericPipe extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void func_94332_a(IconRegister iconRegister) + public void registerIcons(IconRegister iconRegister) { if (!skippedFirstIconRegister){ skippedFirstIconRegister = true; diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index 085f4519..ea096a04 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -58,35 +58,35 @@ public class GateIconProvider implements IIconProvider { registered = true; icons = new Icon[MAX]; - icons[GateIconProvider.Gate_Dark] = iconRegister.func_94245_a("buildcraft:gate_dark"); - icons[GateIconProvider.Gate_Lit] = iconRegister.func_94245_a("buildcraft:gate_lit"); - icons[GateIconProvider.Gate_Iron_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_iron_and_dark"); - icons[GateIconProvider.Gate_Iron_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_iron_and_lit"); - icons[GateIconProvider.Gate_Iron_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_iron_or_dark"); - icons[GateIconProvider.Gate_Iron_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_iron_or_lit"); - icons[GateIconProvider.Gate_Gold_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_gold_and_dark"); - icons[GateIconProvider.Gate_Gold_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_gold_and_lit"); - icons[GateIconProvider.Gate_Gold_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_gold_or_dark"); - icons[GateIconProvider.Gate_Gold_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_gold_or_lit"); - icons[GateIconProvider.Gate_Diamond_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_diamond_and_dark"); - icons[GateIconProvider.Gate_Diamond_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_diamond_and_lit"); - icons[GateIconProvider.Gate_Diamond_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_diamond_or_dark"); - icons[GateIconProvider.Gate_Diamond_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_diamond_or_lit"); + icons[GateIconProvider.Gate_Dark] = iconRegister.registerIcons("buildcraft:gate_dark"); + icons[GateIconProvider.Gate_Lit] = iconRegister.registerIcons("buildcraft:gate_lit"); + icons[GateIconProvider.Gate_Iron_And_Dark] = iconRegister.registerIcons("buildcraft:gate_iron_and_dark"); + icons[GateIconProvider.Gate_Iron_And_Lit] = iconRegister.registerIcons("buildcraft:gate_iron_and_lit"); + icons[GateIconProvider.Gate_Iron_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_iron_or_dark"); + icons[GateIconProvider.Gate_Iron_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_iron_or_lit"); + icons[GateIconProvider.Gate_Gold_And_Dark] = iconRegister.registerIcons("buildcraft:gate_gold_and_dark"); + icons[GateIconProvider.Gate_Gold_And_Lit] = iconRegister.registerIcons("buildcraft:gate_gold_and_lit"); + icons[GateIconProvider.Gate_Gold_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_gold_or_dark"); + icons[GateIconProvider.Gate_Gold_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_gold_or_lit"); + icons[GateIconProvider.Gate_Diamond_And_Dark] = iconRegister.registerIcons("buildcraft:gate_diamond_and_dark"); + icons[GateIconProvider.Gate_Diamond_And_Lit] = iconRegister.registerIcons("buildcraft:gate_diamond_and_lit"); + icons[GateIconProvider.Gate_Diamond_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_diamond_or_dark"); + icons[GateIconProvider.Gate_Diamond_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_diamond_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_dark"); - icons[GateIconProvider.Gate_Autarchic_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_lit"); - icons[GateIconProvider.Gate_Autarchic_Iron_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Iron_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Iron_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Iron_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_iron_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Gold_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Gold_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Gold_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Gold_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_gold_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Diamond_And_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Diamond_And_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Dark] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Lit] = iconRegister.func_94245_a("buildcraft:gate_autarchic_diamond_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_dark"); + icons[GateIconProvider.Gate_Autarchic_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_or_lit"); } } diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 7b2b184f..1343c316 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -150,14 +150,14 @@ public class ItemFacade extends ItemBuildCraft { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { // NOOP } @Override @SideOnly(Side.CLIENT) - public int func_94901_k() + public int getSpriteNumber() { return 0; } diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index e9f06863..59c7c594 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -113,7 +113,7 @@ public class ItemGate extends ItemBuildCraft { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister iconRegister) + public void updateIcons(IconRegister iconRegister) { for (IAction action : ActionManager.actions){ @@ -127,21 +127,21 @@ public class ItemGate extends ItemBuildCraft { } icons = new Icon[ItemGate.MAX]; - icons[ItemGate.Gate] = iconRegister.func_94245_a("buildcraft:gate"); - icons[ItemGate.Gate_Iron_And] = iconRegister.func_94245_a("buildcraft:gate_iron_and"); - icons[ItemGate.Gate_Iron_Or] = iconRegister.func_94245_a("buildcraft:gate_iron_or"); - icons[ItemGate.Gate_Gold_And] = iconRegister.func_94245_a("buildcraft:gate_gold_and"); - icons[ItemGate.Gate_Gold_Or] = iconRegister.func_94245_a("buildcraft:gate_gold_or"); - icons[ItemGate.Gate_Diamond_And] = iconRegister.func_94245_a("buildcraft:gate_diamond_and"); - icons[ItemGate.Gate_Diamond_Or] = iconRegister.func_94245_a("buildcraft:gate_diamond_or"); + icons[ItemGate.Gate] = iconRegister.registerIcons("buildcraft:gate"); + icons[ItemGate.Gate_Iron_And] = iconRegister.registerIcons("buildcraft:gate_iron_and"); + icons[ItemGate.Gate_Iron_Or] = iconRegister.registerIcons("buildcraft:gate_iron_or"); + icons[ItemGate.Gate_Gold_And] = iconRegister.registerIcons("buildcraft:gate_gold_and"); + icons[ItemGate.Gate_Gold_Or] = iconRegister.registerIcons("buildcraft:gate_gold_or"); + icons[ItemGate.Gate_Diamond_And] = iconRegister.registerIcons("buildcraft:gate_diamond_and"); + icons[ItemGate.Gate_Diamond_Or] = iconRegister.registerIcons("buildcraft:gate_diamond_or"); - icons[ItemGate.Autarchic_Gate] = iconRegister.func_94245_a("buildcraft:autarchic_gate"); - icons[ItemGate.Autarchic_Gate_Iron_And] = iconRegister.func_94245_a("buildcraft:autarchic_gate_iron_and"); - icons[ItemGate.Autarchic_Gate_Iron_Or] = iconRegister.func_94245_a("buildcraft:autarchic_gate_iron_or"); - icons[ItemGate.Autarchic_Gate_Gold_And] = iconRegister.func_94245_a("buildcraft:autarchic_gate_gold_and"); - icons[ItemGate.Autarchic_Gate_Gold_Or] = iconRegister.func_94245_a("buildcraft:autarchic_gate_gold_or"); - icons[ItemGate.Autarchic_Gate_Diamond_And] = iconRegister.func_94245_a("buildcraft:autarchic_gate_diamond_and"); - icons[ItemGate.Autarchic_Gate_Diamond_Or] = iconRegister.func_94245_a("buildcraft:autarchic_gate_diamond_or"); + icons[ItemGate.Autarchic_Gate] = iconRegister.registerIcons("buildcraft:autarchic_gate"); + icons[ItemGate.Autarchic_Gate_Iron_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_iron_and"); + icons[ItemGate.Autarchic_Gate_Iron_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_iron_or"); + icons[ItemGate.Autarchic_Gate_Gold_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_gold_and"); + icons[ItemGate.Autarchic_Gate_Gold_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_gold_or"); + icons[ItemGate.Autarchic_Gate_Diamond_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_diamond_and"); + icons[ItemGate.Autarchic_Gate_Diamond_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_diamond_or"); } diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 5fab1dfc..5cea1bd7 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -109,14 +109,14 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { @Override @SideOnly(Side.CLIENT) - public void func_94581_a(IconRegister par1IconRegister) + public void updateIcons(IconRegister par1IconRegister) { // NOOP } @Override @SideOnly(Side.CLIENT) - public int func_94901_k() { + public int getSpriteNumber() { return 0; } } diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index f302d29b..80fe43f4 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -64,49 +64,49 @@ public class PipeIconProvider implements IIconProvider { _icons = new Icon[PipeIconProvider.MAX]; - _icons[PipeIconProvider.PipeStructureCobblestone] = iconRegister.func_94245_a("buildcraft:pipeStructureCobblestone"); + _icons[PipeIconProvider.PipeStructureCobblestone] = iconRegister.registerIcons("buildcraft:pipeStructureCobblestone"); - _icons[PipeIconProvider.PipeItemsCobbleStone] = iconRegister.func_94245_a("buildcraft:pipeItemsCobblestone"); + _icons[PipeIconProvider.PipeItemsCobbleStone] = iconRegister.registerIcons("buildcraft:pipeItemsCobblestone"); - _icons[PipeIconProvider.PipeItemsDiamond_Center] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_center"); - _icons[PipeIconProvider.PipeItemsDiamond_Down] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_down"); - _icons[PipeIconProvider.PipeItemsDiamond_Up] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_up"); - _icons[PipeIconProvider.PipeItemsDiamond_North] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_north"); - _icons[PipeIconProvider.PipeItemsDiamond_South] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_south"); - _icons[PipeIconProvider.PipeItemsDiamond_West] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_west"); - _icons[PipeIconProvider.PipeItemsDiamond_East] = iconRegister.func_94245_a("buildcraft:pipeItemsDiamond_east"); + _icons[PipeIconProvider.PipeItemsDiamond_Center] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_center"); + _icons[PipeIconProvider.PipeItemsDiamond_Down] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_down"); + _icons[PipeIconProvider.PipeItemsDiamond_Up] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_up"); + _icons[PipeIconProvider.PipeItemsDiamond_North] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_north"); + _icons[PipeIconProvider.PipeItemsDiamond_South] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_south"); + _icons[PipeIconProvider.PipeItemsDiamond_West] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_west"); + _icons[PipeIconProvider.PipeItemsDiamond_East] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_east"); - _icons[PipeIconProvider.PipeItemsWood_Standard] = iconRegister.func_94245_a("buildcraft:pipeItemsWood_standard"); - _icons[PipeIconProvider.PipeAllWood_Solid] = iconRegister.func_94245_a("buildcraft:pipeAllWood_solid"); + _icons[PipeIconProvider.PipeItemsWood_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsWood_standard"); + _icons[PipeIconProvider.PipeAllWood_Solid] = iconRegister.registerIcons("buildcraft:pipeAllWood_solid"); - _icons[PipeIconProvider.PipeItemsEmerald_Standard] = iconRegister.func_94245_a("buildcraft:pipeItemsEmerald_standard"); - _icons[PipeIconProvider.PipeAllEmerald_Solid] = iconRegister.func_94245_a("buildcraft:pipeAllEmerald_solid"); + _icons[PipeIconProvider.PipeItemsEmerald_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsEmerald_standard"); + _icons[PipeIconProvider.PipeAllEmerald_Solid] = iconRegister.registerIcons("buildcraft:pipeAllEmerald_solid"); - _icons[PipeIconProvider.PipeItemsGold] = iconRegister.func_94245_a("buildcraft:pipeItemsGold"); + _icons[PipeIconProvider.PipeItemsGold] = iconRegister.registerIcons("buildcraft:pipeItemsGold"); - _icons[PipeIconProvider.PipeItemsIron_Standard] = iconRegister.func_94245_a("buildcraft:pipeItemsIron_standard"); - _icons[PipeIconProvider.PipeAllIron_Solid] = iconRegister.func_94245_a("buildcraft:pipeAllIron_solid"); + _icons[PipeIconProvider.PipeItemsIron_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsIron_standard"); + _icons[PipeIconProvider.PipeAllIron_Solid] = iconRegister.registerIcons("buildcraft:pipeAllIron_solid"); - _icons[PipeIconProvider.PipeItemsObsidian] = iconRegister.func_94245_a("buildcraft:pipeItemsObsidian"); - _icons[PipeIconProvider.PipeItemsSandstone] = iconRegister.func_94245_a("buildcraft:pipeItemsSandstone"); - _icons[PipeIconProvider.PipeItemsStone] = iconRegister.func_94245_a("buildcraft:pipeItemsStone"); - _icons[PipeIconProvider.PipeItemsVoid] = iconRegister.func_94245_a("buildcraft:pipeItemsVoid"); + _icons[PipeIconProvider.PipeItemsObsidian] = iconRegister.registerIcons("buildcraft:pipeItemsObsidian"); + _icons[PipeIconProvider.PipeItemsSandstone] = iconRegister.registerIcons("buildcraft:pipeItemsSandstone"); + _icons[PipeIconProvider.PipeItemsStone] = iconRegister.registerIcons("buildcraft:pipeItemsStone"); + _icons[PipeIconProvider.PipeItemsVoid] = iconRegister.registerIcons("buildcraft:pipeItemsVoid"); - _icons[PipeIconProvider.PipeLiquidsCobblestone] = iconRegister.func_94245_a("buildcraft:pipeLiquidsCobblestone"); - _icons[PipeIconProvider.PipeLiquidsWood_Standard] = iconRegister.func_94245_a("buildcraft:pipeLiquidsWood_standard"); - _icons[PipeIconProvider.PipeLiquidsEmerald_Standard] = iconRegister.func_94245_a("buildcraft:pipeLiquidsEmerald_standard"); - _icons[PipeIconProvider.PipeLiquidsGold] = iconRegister.func_94245_a("buildcraft:pipeLiquidsGold"); - _icons[PipeIconProvider.PipeLiquidsIron_Standard] = iconRegister.func_94245_a("buildcraft:pipeLiquidsIron_standard"); - _icons[PipeIconProvider.PipeLiquidsSandstone] = iconRegister.func_94245_a("buildcraft:pipeLiquidsSandstone"); - _icons[PipeIconProvider.PipeLiquidsStone] = iconRegister.func_94245_a("buildcraft:pipeLiquidsStone"); - _icons[PipeIconProvider.PipeLiquidsVoid] = iconRegister.func_94245_a("buildcraft:pipeLiquidsVoid"); + _icons[PipeIconProvider.PipeLiquidsCobblestone] = iconRegister.registerIcons("buildcraft:pipeLiquidsCobblestone"); + _icons[PipeIconProvider.PipeLiquidsWood_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsWood_standard"); + _icons[PipeIconProvider.PipeLiquidsEmerald_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsEmerald_standard"); + _icons[PipeIconProvider.PipeLiquidsGold] = iconRegister.registerIcons("buildcraft:pipeLiquidsGold"); + _icons[PipeIconProvider.PipeLiquidsIron_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsIron_standard"); + _icons[PipeIconProvider.PipeLiquidsSandstone] = iconRegister.registerIcons("buildcraft:pipeLiquidsSandstone"); + _icons[PipeIconProvider.PipeLiquidsStone] = iconRegister.registerIcons("buildcraft:pipeLiquidsStone"); + _icons[PipeIconProvider.PipeLiquidsVoid] = iconRegister.registerIcons("buildcraft:pipeLiquidsVoid"); - _icons[PipeIconProvider.PipePowerGold] = iconRegister.func_94245_a("buildcraft:pipePowerGold"); - _icons[PipeIconProvider.PipePowerStone] = iconRegister.func_94245_a("buildcraft:pipePowerStone"); - _icons[PipeIconProvider.PipePowerWood_Standard] = iconRegister.func_94245_a("buildcraft:pipePowerWood_standard"); + _icons[PipeIconProvider.PipePowerGold] = iconRegister.registerIcons("buildcraft:pipePowerGold"); + _icons[PipeIconProvider.PipePowerStone] = iconRegister.registerIcons("buildcraft:pipePowerStone"); + _icons[PipeIconProvider.PipePowerWood_Standard] = iconRegister.registerIcons("buildcraft:pipePowerWood_standard"); - _icons[PipeIconProvider.Power_Normal] = iconRegister.func_94245_a("buildcraft:texture_cyan"); - _icons[PipeIconProvider.Power_Overload] = iconRegister.func_94245_a("buildcraft:texture_red_dark"); + _icons[PipeIconProvider.Power_Normal] = iconRegister.registerIcons("buildcraft:texture_cyan"); + _icons[PipeIconProvider.Power_Overload] = iconRegister.registerIcons("buildcraft:texture_red_dark"); } } diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index e1a5c9e8..3ceb7389 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -244,7 +244,7 @@ public class PipeTransportPower extends PipeTransport { if (internalNextPower[from.ordinal()] >= MAX_POWER_INTERNAL) { worldObj.createExplosion(null, xCoord, yCoord, zCoord, 3, false); - worldObj.func_94575_c(xCoord, yCoord, zCoord, 0); + worldObj.setBlock(xCoord, yCoord, zCoord, 0); } } } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index d6cf554f..1c7286d8 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -647,7 +647,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank @Override @SideOnly(Side.CLIENT) - public double func_82115_m() { + public double getMaxRenderDistanceSquared() { return DefaultProps.PIPE_CONTENTS_RENDER_DIST * DefaultProps.PIPE_CONTENTS_RENDER_DIST; } diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 45579d9b..10c5a8bc 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -38,14 +38,14 @@ public class WireIconProvider implements IIconProvider { icons = new Icon[MAX]; - icons[WireIconProvider.Texture_Red_Dark] = iconRegister.func_94245_a("buildcraft:texture_red_dark"); - icons[WireIconProvider.Texture_Red_Lit] = iconRegister.func_94245_a("buildcraft:texture_red_lit"); - icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.func_94245_a("buildcraft:texture_blue_dark"); - icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.func_94245_a("buildcraft:texture_blue_lit"); - icons[WireIconProvider.Texture_Green_Dark] = iconRegister.func_94245_a("buildcraft:texture_green_dark"); - icons[WireIconProvider.Texture_Green_Lit] = iconRegister.func_94245_a("buildcraft:texture_green_lit"); - icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.func_94245_a("buildcraft:texture_yellow_dark"); - icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.func_94245_a("buildcraft:texture_yellow_lit"); + icons[WireIconProvider.Texture_Red_Dark] = iconRegister.registerIcons("buildcraft:texture_red_dark"); + icons[WireIconProvider.Texture_Red_Lit] = iconRegister.registerIcons("buildcraft:texture_red_lit"); + icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.registerIcons("buildcraft:texture_blue_dark"); + icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.registerIcons("buildcraft:texture_blue_lit"); + icons[WireIconProvider.Texture_Green_Dark] = iconRegister.registerIcons("buildcraft:texture_green_dark"); + icons[WireIconProvider.Texture_Green_Lit] = iconRegister.registerIcons("buildcraft:texture_green_lit"); + icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.registerIcons("buildcraft:texture_yellow_dark"); + icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.registerIcons("buildcraft:texture_yellow_lit"); } diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index 8f6f7d91..83c37310 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -56,7 +56,7 @@ public class GuiDiamondPipe extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/filter.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/filter.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/gui/GuiEmeraldPipe.java b/common/buildcraft/transport/gui/GuiEmeraldPipe.java index e0d39f60..dfac88c7 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldPipe.java @@ -53,7 +53,7 @@ public class GuiEmeraldPipe extends GuiAdvancedInterface { @Override protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(DefaultProps.TEXTURE_PATH_GUI + "/filter_2.png"); + mc.renderEngine.bindTexture(DefaultProps.TEXTURE_PATH_GUI + "/filter_2.png"); int j = (width - xSize) / 2; int k = (height - ySize) / 2; drawTexturedModalRect(j, k, 0, 0, xSize, ySize); diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index 8cb76973..d53abad5 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -238,9 +238,11 @@ public class GuiGateInterface extends GuiAdvancedInterface { protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { _container.synchronize(); - + + String texture = _container.getGateGuiFile(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.func_98187_b(_container.getGateGuiFile()); + mc.renderEngine.bindTexture(texture); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index 960f792d..aa66ca14 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -296,17 +296,15 @@ public class PipeItemsEmerald extends PipeItemsWood implements ISpecialInventory } - @Override - public boolean func_94042_c() - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isInvNameLocalized() { + // TODO Auto-generated method stub + return false; + } - @Override - public boolean func_94041_b(int i, ItemStack itemstack) - { - // TODO Auto-generated method stub - return false; - } + @Override + public boolean isStackValidForSlot(int i, ItemStack itemstack) { + // TODO Auto-generated method stub + return false; + } } diff --git a/common/buildcraft/transport/pipes/PipeLogicDiamond.java b/common/buildcraft/transport/pipes/PipeLogicDiamond.java index 5076deb3..765519ad 100644 --- a/common/buildcraft/transport/pipes/PipeLogicDiamond.java +++ b/common/buildcraft/transport/pipes/PipeLogicDiamond.java @@ -134,14 +134,14 @@ public class PipeLogicDiamond extends PipeLogic implements ISpecialInventory { } @Override - public boolean func_94042_c() + public boolean isInvNameLocalized() { // TODO Auto-generated method stub return false; } @Override - public boolean func_94041_b(int i, ItemStack itemstack) + public boolean isStackValidForSlot(int i, ItemStack itemstack) { // TODO Auto-generated method stub return false; From 8192c8d792764fbc9e65d78db6e56f9114241e70 Mon Sep 17 00:00:00 2001 From: Krapht Date: Fri, 22 Mar 2013 20:36:01 +0100 Subject: [PATCH 34/93] Update names for forge build 604 --- .../buildcraft/builders/BlockArchitect.java | 10 +-- .../builders/BlockBlueprintLibrary.java | 4 +- common/buildcraft/builders/BlockBuilder.java | 6 +- common/buildcraft/builders/BlockFiller.java | 6 +- common/buildcraft/builders/BlockMarker.java | 2 +- .../buildcraft/builders/BlockPathMarker.java | 4 +- .../builders/BuilderProxyClient.java | 12 ++-- common/buildcraft/builders/ItemBptBase.java | 2 +- .../buildcraft/builders/ItemBptBluePrint.java | 4 +- .../buildcraft/builders/ItemBptTemplate.java | 2 +- common/buildcraft/core/BlockSpring.java | 2 +- common/buildcraft/core/CoreIconProvider.java | 2 +- common/buildcraft/core/ItemBuildCraft.java | 2 +- .../buildcraft/core/ItemRedstoneChipset.java | 2 +- .../core/proxy/CoreProxyClient.java | 8 +-- .../triggers/ActionTriggerIconProvider.java | 62 ++++++++--------- common/buildcraft/energy/BlockPollution.java | 2 +- common/buildcraft/energy/ItemBucketOil.java | 2 +- .../factory/BlockAutoWorkbench.java | 4 +- common/buildcraft/factory/BlockFrame.java | 2 +- .../buildcraft/factory/BlockMiningWell.java | 8 +-- common/buildcraft/factory/BlockPlainPipe.java | 2 +- common/buildcraft/factory/BlockPump.java | 6 +- common/buildcraft/factory/BlockQuarry.java | 6 +- common/buildcraft/factory/BlockTank.java | 6 +- .../factory/FactoryProxyClient.java | 6 +- .../silicon/BlockAssemblyTable.java | 12 ++-- common/buildcraft/silicon/BlockLaser.java | 6 +- .../transport/GateIconProvider.java | 56 ++++++++-------- common/buildcraft/transport/ItemGate.java | 28 ++++---- .../transport/PipeIconProvider.java | 66 +++++++++---------- .../transport/WireIconProvider.java | 16 ++--- 32 files changed, 179 insertions(+), 179 deletions(-) diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 5f106b8d..289fca1a 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -145,10 +145,10 @@ public class BlockArchitect extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockTextureSides = par1IconRegister.registerIcons("buildcraft:architect_sides"); - blockTextureTopNeg = par1IconRegister.registerIcons("buildcraft:architect_top_neg"); - blockTextureTopPos = par1IconRegister.registerIcons("buildcraft:architect_top_pos"); - blockTextureTopArchitect = par1IconRegister.registerIcons("buildcraft:architect_top"); - blockTextureFront = par1IconRegister.registerIcons("buildcraft:architect_front"); + blockTextureSides = par1IconRegister.registerIcon("buildcraft:architect_sides"); + blockTextureTopNeg = par1IconRegister.registerIcon("buildcraft:architect_top_neg"); + blockTextureTopPos = par1IconRegister.registerIcon("buildcraft:architect_top_pos"); + blockTextureTopArchitect = par1IconRegister.registerIcon("buildcraft:architect_top"); + blockTextureFront = par1IconRegister.registerIcon("buildcraft:architect_front"); } } diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index a0f49cdb..cf0c4318 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -92,7 +92,7 @@ public class BlockBlueprintLibrary extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcons("buildcraft:library_topbottom"); - textureSide = par1IconRegister.registerIcons("buildcraft:library_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:library_topbottom"); + textureSide = par1IconRegister.registerIcon("buildcraft:library_side"); } } diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 07e79d51..4161befb 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -132,8 +132,8 @@ public class BlockBuilder extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockTextureTop = par1IconRegister.registerIcons("buildcraft:builder_top"); - blockTextureSide = par1IconRegister.registerIcons("buildcraft:builder_side"); - blockTextureFront = par1IconRegister.registerIcons("buildcraft:builder_front"); + blockTextureTop = par1IconRegister.registerIcon("buildcraft:builder_top"); + blockTextureSide = par1IconRegister.registerIcon("buildcraft:builder_side"); + blockTextureFront = par1IconRegister.registerIcon("buildcraft:builder_front"); } } diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 6ea21900..c0ee0daf 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -113,8 +113,8 @@ public class BlockFiller extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTopOn = par1IconRegister.registerIcons("buildcraft:blockFillerTopOn"); - textureTopOff = par1IconRegister.registerIcons("buildcraft:blockFillerTopOff"); - textureSides = par1IconRegister.registerIcons("buildcraft:blockFillerSides"); + textureTopOn = par1IconRegister.registerIcon("buildcraft:blockFillerTopOn"); + textureTopOff = par1IconRegister.registerIcon("buildcraft:blockFillerTopOff"); + textureSides = par1IconRegister.registerIcon("buildcraft:blockFillerSides"); } } diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index d1734dae..67af26e8 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -224,6 +224,6 @@ public class BlockMarker extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockMarker"); + par1IconRegister.registerIcon("buildcraft:blockMarker"); } } diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index 5c91010a..249afe33 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -62,7 +62,7 @@ public class BlockPathMarker extends BlockMarker { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockIcon = par1IconRegister.registerIcons("buildcraft:blockPathMarker"); - activeMarker = par1IconRegister.registerIcons("buildcraft:blockPathMarkerActive"); + blockIcon = par1IconRegister.registerIcon("buildcraft:blockPathMarker"); + activeMarker = par1IconRegister.registerIcon("buildcraft:blockPathMarkerActive"); } } diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 1f08204c..1f329a9c 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -16,12 +16,12 @@ public class BuilderProxyClient extends BuilderProxy { public void initializeTextures() { TextureMap terrainMap = Minecraft.getMinecraft().renderEngine.textureMapItems; - fillerFillAllTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/fillAll"); - fillerClearTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/clear"); - fillerWallsTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/walls"); - fillerStairsTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/stairs"); - fillerFlattenTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/flatten"); - fillerPyramidTexture = terrainMap.registerIcons("buildcraft:fillerPatterns/pyramid"); + fillerFillAllTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/fillAll"); + fillerClearTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/clear"); + fillerWallsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/walls"); + fillerStairsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/stairs"); + fillerFlattenTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/flatten"); + fillerPyramidTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/pyramid"); } @Override public void registerClientHook() { diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index 419c4ecb..0822aba7 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -65,6 +65,6 @@ public abstract class ItemBptBase extends ItemBuildCraft { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:template_clean"); + par1IconRegister.registerIcon("buildcraft:template_clean"); } } diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java index 943cb5b2..b9e76c34 100644 --- a/common/buildcraft/builders/ItemBptBluePrint.java +++ b/common/buildcraft/builders/ItemBptBluePrint.java @@ -35,7 +35,7 @@ public class ItemBptBluePrint extends ItemBptBase { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - cleanBlueprint = par1IconRegister.registerIcons("buildcraft:blueprint_clean"); - usedBlueprint = par1IconRegister.registerIcons("buildcraft:blueprint_used"); + cleanBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_clean"); + usedBlueprint = par1IconRegister.registerIcon("buildcraft:blueprint_used"); } } diff --git a/common/buildcraft/builders/ItemBptTemplate.java b/common/buildcraft/builders/ItemBptTemplate.java index 56f958b1..97e93f5e 100644 --- a/common/buildcraft/builders/ItemBptTemplate.java +++ b/common/buildcraft/builders/ItemBptTemplate.java @@ -24,6 +24,6 @@ public class ItemBptTemplate extends ItemBptBase { public void updateIcons(IconRegister par1IconRegister) { super.updateIcons(par1IconRegister); - par1IconRegister.registerIcons("buildcraft:template_used"); + par1IconRegister.registerIcon("buildcraft:template_used"); } } diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index cfcf9757..02b19630 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -44,6 +44,6 @@ public class BlockSpring extends Block { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - blockIcon = par1IconRegister.registerIcons("water"); + blockIcon = par1IconRegister.registerIcon("water"); } } diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 60df225b..23c1497f 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -25,7 +25,7 @@ public class CoreIconProvider implements IIconProvider { public void registerIcons(IconRegister iconRegister) { _icons = new Icon[MAX]; - _icons[ENERGY] = iconRegister.registerIcons("buildcraft:icons/energy"); + _icons[ENERGY] = iconRegister.registerIcon("buildcraft:icons/energy"); } diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index 5bc04aaa..9a8fe405 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -39,6 +39,6 @@ public class ItemBuildCraft extends Item { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - this.iconIndex = par1IconRegister.registerIcons("buildcraft:" + iconName); + this.iconIndex = par1IconRegister.registerIcon("buildcraft:" + iconName); } } diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index 25e6ab8c..c6a39fcd 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -49,7 +49,7 @@ public class ItemRedstoneChipset extends ItemBuildCraft { icons = new Icon[chipsetNames.length]; int i = 0; for (String csName : chipsetNames) { - icons[i++] = par1IconRegister.registerIcons("buildcraft:"+csName+"_chipset"); + icons[i++] = par1IconRegister.registerIcon("buildcraft:"+csName+"_chipset"); } } } diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index ef75ee27..c6e14d0f 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -119,10 +119,10 @@ public class CoreProxyClient extends CoreProxy { RenderingRegistry.registerBlockHandler(new RenderingMarkers()); TextureMap blockTextureMap = Minecraft.getMinecraft().renderEngine.textureMapItems; - BuildCraftCore.redLaserTexture = blockTextureMap.registerIcons("buildcraft:blockRedLaser"); - BuildCraftCore.blueLaserTexture = blockTextureMap.registerIcons("buildcraft:blockBlueLaser"); - BuildCraftCore.stripesLaserTexture = blockTextureMap.registerIcons("buildcraft:blockStripesLaser"); - BuildCraftCore.transparentTexture = blockTextureMap.registerIcons("buildcraft:blockTransparentLaser"); + BuildCraftCore.redLaserTexture = blockTextureMap.registerIcon("buildcraft:blockRedLaser"); + BuildCraftCore.blueLaserTexture = blockTextureMap.registerIcon("buildcraft:blockBlueLaser"); + BuildCraftCore.stripesLaserTexture = blockTextureMap.registerIcon("buildcraft:blockStripesLaser"); + BuildCraftCore.transparentTexture = blockTextureMap.registerIcon("buildcraft:blockTransparentLaser"); } @Override diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index 1624d479..6a01d88c 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -62,38 +62,38 @@ public class ActionTriggerIconProvider implements IIconProvider { registered = true; icons = new Icon[MAX]; - icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_on"); - icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_off"); - icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.registerIcons("buildcraft:triggers/action_machinecontrol_loop"); + icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_on"); + icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_off"); + icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_loop"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_blue"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_green"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_yellow"); - icons[ActionTriggerIconProvider.Trigger_EngineHeat_Red] = iconRegister.registerIcons("buildcraft:triggers/trigger_engineheat_red"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_empty"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Contains] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_contains"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Space] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_space"); - icons[ActionTriggerIconProvider.Trigger_Inventory_Full] = iconRegister.registerIcons("buildcraft:triggers/trigger_inventory_full"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_empty"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Contains] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_contains"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Space] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_space"); - icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Full] = iconRegister.registerIcons("buildcraft:triggers/trigger_liquidcontainer_full"); - icons[ActionTriggerIconProvider.Trigger_Machine_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_machine_active"); - icons[ActionTriggerIconProvider.Trigger_Machine_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_machine_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_Empty] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_empty"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsitems"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsliquid"); - icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipecontents_containsenergy"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_red_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_red_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_blue_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_blue_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_green_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_green_inactive"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_yellow_active"); - icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); - icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.registerIcons("buildcraft:triggers/trigger_redstoneinput_active"); - icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.registerIcons("buildcraft:triggers/trigger_redstoneinput_inactive"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_blue"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_green"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_yellow"); + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Red] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_red"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Empty] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_empty"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Contains] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_contains"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Space] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_space"); + icons[ActionTriggerIconProvider.Trigger_Inventory_Full] = iconRegister.registerIcon("buildcraft:triggers/trigger_inventory_full"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Empty] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_empty"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Contains] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_contains"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Space] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_space"); + icons[ActionTriggerIconProvider.Trigger_LiquidContainer_Full] = iconRegister.registerIcon("buildcraft:triggers/trigger_liquidcontainer_full"); + icons[ActionTriggerIconProvider.Trigger_Machine_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_machine_active"); + icons[ActionTriggerIconProvider.Trigger_Machine_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_machine_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_Empty] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_empty"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsItems] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_containsitems"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsLiquid] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_containsliquid"); + icons[ActionTriggerIconProvider.Trigger_PipeContents_ContainsEnergy] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipecontents_containsenergy"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_red_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Red_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_red_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_blue_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Blue_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_blue_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_green_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Green_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_green_inactive"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_active"); + icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_redstoneinput_active"); + icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_redstoneinput_inactive"); } diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index 4e8d4be0..e579e7bd 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -45,6 +45,6 @@ public class BlockPollution extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockPollution"); + par1IconRegister.registerIcon("buildcraft:blockPollution"); } } diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java index cd215955..734d20f4 100644 --- a/common/buildcraft/energy/ItemBucketOil.java +++ b/common/buildcraft/energy/ItemBucketOil.java @@ -35,6 +35,6 @@ public class ItemBucketOil extends ItemBucket { @SideOnly(Side.CLIENT) public void updateIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:oil_bucket"); + par1IconRegister.registerIcon("buildcraft:oil_bucket"); } } diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index f5825f23..89c61258 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -79,7 +79,7 @@ public class BlockAutoWorkbench extends BlockBuildCraft { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - topTexture = par1IconRegister.registerIcons("buildcraft:autoWorkbench_top"); - sideTexture = par1IconRegister.registerIcons("buildcraft:autoWorkbench_side"); + topTexture = par1IconRegister.registerIcon("buildcraft:autoWorkbench_top"); + sideTexture = par1IconRegister.registerIcon("buildcraft:autoWorkbench_side"); } } diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 37d5f27d..f3c59261 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -198,6 +198,6 @@ public class BlockFrame extends Block implements IFramePipeConnection { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockFrame"); + par1IconRegister.registerIcon("buildcraft:blockFrame"); } } diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index cb3ddb1d..2ef00f97 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -91,9 +91,9 @@ public class BlockMiningWell extends BlockMachineRoot { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureFront = par1IconRegister.registerIcons("buildcraft:miningwell_front"); - textureSides = par1IconRegister.registerIcons("buildcraft:miningwell_side"); - textureBack = par1IconRegister.registerIcons("buildcraft:miningwell_back"); - textureTop = par1IconRegister.registerIcons("buildcraft:miningwell_top"); + textureFront = par1IconRegister.registerIcon("buildcraft:miningwell_front"); + textureSides = par1IconRegister.registerIcon("buildcraft:miningwell_side"); + textureBack = par1IconRegister.registerIcon("buildcraft:miningwell_back"); + textureTop = par1IconRegister.registerIcon("buildcraft:miningwell_top"); } } diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index 72cfd08c..92016cf9 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -77,6 +77,6 @@ public class BlockPlainPipe extends Block implements IFramePipeConnection { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcons("buildcraft:blockPlainPipe"); + par1IconRegister.registerIcon("buildcraft:blockPlainPipe"); } } diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index df41c381..fe195834 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -70,8 +70,8 @@ public class BlockPump extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcons("buildcraft:pump_top"); - textureBottom = par1IconRegister.registerIcons("buildcraft:pump_bottom"); - textureSide = par1IconRegister.registerIcons("buildcraft:pump_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:pump_top"); + textureBottom = par1IconRegister.registerIcon("buildcraft:pump_bottom"); + textureSide = par1IconRegister.registerIcon("buildcraft:pump_side"); } } diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 494ed76d..6d71933e 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -227,8 +227,8 @@ public class BlockQuarry extends BlockMachineRoot { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureSide = par1IconRegister.registerIcons("buildcraft:quarry_side"); - textureTop = par1IconRegister.registerIcons("buildcraft:quarry_top"); - textureFront = par1IconRegister.registerIcons("buildcraft:quarry_front"); + textureSide = par1IconRegister.registerIcon("buildcraft:quarry_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:quarry_top"); + textureFront = par1IconRegister.registerIcon("buildcraft:quarry_front"); } } diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index 21f26944..ec785650 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -139,9 +139,9 @@ public class BlockTank extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureStackedSide = par1IconRegister.registerIcons("buildcraft:tank_stacked_side"); - textureBottomSide = par1IconRegister.registerIcons("buildcraft:tank_bottom_side"); - textureTop = par1IconRegister.registerIcons("buildcraft:tank_top"); + textureStackedSide = par1IconRegister.registerIcon("buildcraft:tank_stacked_side"); + textureBottomSide = par1IconRegister.registerIcon("buildcraft:tank_bottom_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:tank_top"); } } diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index e87845ef..0597c045 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -43,9 +43,9 @@ public class FactoryProxyClient extends FactoryProxy { public void initializeEntityRenders() { RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid()); TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.textureMapItems; - pumpTexture = terrainTextures.registerIcons("buildcraft:blockPumpTubeTexture"); - drillTexture = terrainTextures.registerIcons("buildcraft:blockDrillTexture"); - drillHeadTexture = terrainTextures.registerIcons("buildcraft:blockDrillHeadTexture"); + pumpTexture = terrainTextures.registerIcon("buildcraft:blockPumpTubeTexture"); + drillTexture = terrainTextures.registerIcon("buildcraft:blockDrillTexture"); + drillHeadTexture = terrainTextures.registerIcon("buildcraft:blockDrillHeadTexture"); } @Override diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index 1098f80b..2abc72c4 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -101,11 +101,11 @@ public class BlockAssemblyTable extends BlockContainer { icons = new Icon[2][]; icons[0] = new Icon[3]; icons[1] = new Icon[3]; - icons[0][0] = par1IconRegister.registerIcons("buildcraft:assemblytable_bottom"); - icons[1][0] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_bottom"); - icons[0][1] = par1IconRegister.registerIcons("buildcraft:assemblytable_top"); - icons[1][1] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_top"); - icons[0][2] = par1IconRegister.registerIcons("buildcraft:assemblytable_side"); - icons[1][2] = par1IconRegister.registerIcons("buildcraft:advworkbenchtable_side"); + icons[0][0] = par1IconRegister.registerIcon("buildcraft:assemblytable_bottom"); + icons[1][0] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_bottom"); + icons[0][1] = par1IconRegister.registerIcon("buildcraft:assemblytable_top"); + icons[1][1] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_top"); + icons[0][2] = par1IconRegister.registerIcon("buildcraft:assemblytable_side"); + icons[1][2] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_side"); } } diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 7bd84f3f..60ab4379 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -92,8 +92,8 @@ public class BlockLaser extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - textureTop = par1IconRegister.registerIcons("buildcraft:laser_top"); - textureBottom = par1IconRegister.registerIcons("buildcraft:laser_bottom"); - textureSide = par1IconRegister.registerIcons("buildcraft:laser_side"); + textureTop = par1IconRegister.registerIcon("buildcraft:laser_top"); + textureBottom = par1IconRegister.registerIcon("buildcraft:laser_bottom"); + textureSide = par1IconRegister.registerIcon("buildcraft:laser_side"); } } diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index ea096a04..eec13b8d 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -58,35 +58,35 @@ public class GateIconProvider implements IIconProvider { registered = true; icons = new Icon[MAX]; - icons[GateIconProvider.Gate_Dark] = iconRegister.registerIcons("buildcraft:gate_dark"); - icons[GateIconProvider.Gate_Lit] = iconRegister.registerIcons("buildcraft:gate_lit"); - icons[GateIconProvider.Gate_Iron_And_Dark] = iconRegister.registerIcons("buildcraft:gate_iron_and_dark"); - icons[GateIconProvider.Gate_Iron_And_Lit] = iconRegister.registerIcons("buildcraft:gate_iron_and_lit"); - icons[GateIconProvider.Gate_Iron_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_iron_or_dark"); - icons[GateIconProvider.Gate_Iron_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_iron_or_lit"); - icons[GateIconProvider.Gate_Gold_And_Dark] = iconRegister.registerIcons("buildcraft:gate_gold_and_dark"); - icons[GateIconProvider.Gate_Gold_And_Lit] = iconRegister.registerIcons("buildcraft:gate_gold_and_lit"); - icons[GateIconProvider.Gate_Gold_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_gold_or_dark"); - icons[GateIconProvider.Gate_Gold_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_gold_or_lit"); - icons[GateIconProvider.Gate_Diamond_And_Dark] = iconRegister.registerIcons("buildcraft:gate_diamond_and_dark"); - icons[GateIconProvider.Gate_Diamond_And_Lit] = iconRegister.registerIcons("buildcraft:gate_diamond_and_lit"); - icons[GateIconProvider.Gate_Diamond_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_diamond_or_dark"); - icons[GateIconProvider.Gate_Diamond_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_diamond_or_lit"); + icons[GateIconProvider.Gate_Dark] = iconRegister.registerIcon("buildcraft:gate_dark"); + icons[GateIconProvider.Gate_Lit] = iconRegister.registerIcon("buildcraft:gate_lit"); + icons[GateIconProvider.Gate_Iron_And_Dark] = iconRegister.registerIcon("buildcraft:gate_iron_and_dark"); + icons[GateIconProvider.Gate_Iron_And_Lit] = iconRegister.registerIcon("buildcraft:gate_iron_and_lit"); + icons[GateIconProvider.Gate_Iron_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_iron_or_dark"); + icons[GateIconProvider.Gate_Iron_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_iron_or_lit"); + icons[GateIconProvider.Gate_Gold_And_Dark] = iconRegister.registerIcon("buildcraft:gate_gold_and_dark"); + icons[GateIconProvider.Gate_Gold_And_Lit] = iconRegister.registerIcon("buildcraft:gate_gold_and_lit"); + icons[GateIconProvider.Gate_Gold_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_gold_or_dark"); + icons[GateIconProvider.Gate_Gold_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_gold_or_lit"); + icons[GateIconProvider.Gate_Diamond_And_Dark] = iconRegister.registerIcon("buildcraft:gate_diamond_and_dark"); + icons[GateIconProvider.Gate_Diamond_And_Lit] = iconRegister.registerIcon("buildcraft:gate_diamond_and_lit"); + icons[GateIconProvider.Gate_Diamond_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_diamond_or_dark"); + icons[GateIconProvider.Gate_Diamond_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_diamond_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_dark"); - icons[GateIconProvider.Gate_Autarchic_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_lit"); - icons[GateIconProvider.Gate_Autarchic_Iron_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Iron_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Iron_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Iron_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_iron_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Gold_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Gold_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Gold_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Gold_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_gold_or_lit"); - icons[GateIconProvider.Gate_Autarchic_Diamond_And_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_and_dark"); - icons[GateIconProvider.Gate_Autarchic_Diamond_And_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_and_lit"); - icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Dark] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_or_dark"); - icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Lit] = iconRegister.registerIcons("buildcraft:gate_autarchic_diamond_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_dark"); + icons[GateIconProvider.Gate_Autarchic_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_And_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Iron_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_iron_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_And_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Gold_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_gold_or_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_and_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_And_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_and_lit"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Dark] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_or_dark"); + icons[GateIconProvider.Gate_Autarchic_Diamond_Or_Lit] = iconRegister.registerIcon("buildcraft:gate_autarchic_diamond_or_lit"); } } diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 59c7c594..65bca78f 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -127,21 +127,21 @@ public class ItemGate extends ItemBuildCraft { } icons = new Icon[ItemGate.MAX]; - icons[ItemGate.Gate] = iconRegister.registerIcons("buildcraft:gate"); - icons[ItemGate.Gate_Iron_And] = iconRegister.registerIcons("buildcraft:gate_iron_and"); - icons[ItemGate.Gate_Iron_Or] = iconRegister.registerIcons("buildcraft:gate_iron_or"); - icons[ItemGate.Gate_Gold_And] = iconRegister.registerIcons("buildcraft:gate_gold_and"); - icons[ItemGate.Gate_Gold_Or] = iconRegister.registerIcons("buildcraft:gate_gold_or"); - icons[ItemGate.Gate_Diamond_And] = iconRegister.registerIcons("buildcraft:gate_diamond_and"); - icons[ItemGate.Gate_Diamond_Or] = iconRegister.registerIcons("buildcraft:gate_diamond_or"); + icons[ItemGate.Gate] = iconRegister.registerIcon("buildcraft:gate"); + icons[ItemGate.Gate_Iron_And] = iconRegister.registerIcon("buildcraft:gate_iron_and"); + icons[ItemGate.Gate_Iron_Or] = iconRegister.registerIcon("buildcraft:gate_iron_or"); + icons[ItemGate.Gate_Gold_And] = iconRegister.registerIcon("buildcraft:gate_gold_and"); + icons[ItemGate.Gate_Gold_Or] = iconRegister.registerIcon("buildcraft:gate_gold_or"); + icons[ItemGate.Gate_Diamond_And] = iconRegister.registerIcon("buildcraft:gate_diamond_and"); + icons[ItemGate.Gate_Diamond_Or] = iconRegister.registerIcon("buildcraft:gate_diamond_or"); - icons[ItemGate.Autarchic_Gate] = iconRegister.registerIcons("buildcraft:autarchic_gate"); - icons[ItemGate.Autarchic_Gate_Iron_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_iron_and"); - icons[ItemGate.Autarchic_Gate_Iron_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_iron_or"); - icons[ItemGate.Autarchic_Gate_Gold_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_gold_and"); - icons[ItemGate.Autarchic_Gate_Gold_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_gold_or"); - icons[ItemGate.Autarchic_Gate_Diamond_And] = iconRegister.registerIcons("buildcraft:autarchic_gate_diamond_and"); - icons[ItemGate.Autarchic_Gate_Diamond_Or] = iconRegister.registerIcons("buildcraft:autarchic_gate_diamond_or"); + icons[ItemGate.Autarchic_Gate] = iconRegister.registerIcon("buildcraft:autarchic_gate"); + icons[ItemGate.Autarchic_Gate_Iron_And] = iconRegister.registerIcon("buildcraft:autarchic_gate_iron_and"); + icons[ItemGate.Autarchic_Gate_Iron_Or] = iconRegister.registerIcon("buildcraft:autarchic_gate_iron_or"); + icons[ItemGate.Autarchic_Gate_Gold_And] = iconRegister.registerIcon("buildcraft:autarchic_gate_gold_and"); + icons[ItemGate.Autarchic_Gate_Gold_Or] = iconRegister.registerIcon("buildcraft:autarchic_gate_gold_or"); + icons[ItemGate.Autarchic_Gate_Diamond_And] = iconRegister.registerIcon("buildcraft:autarchic_gate_diamond_and"); + icons[ItemGate.Autarchic_Gate_Diamond_Or] = iconRegister.registerIcon("buildcraft:autarchic_gate_diamond_or"); } diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index 80fe43f4..f231d7b5 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -64,49 +64,49 @@ public class PipeIconProvider implements IIconProvider { _icons = new Icon[PipeIconProvider.MAX]; - _icons[PipeIconProvider.PipeStructureCobblestone] = iconRegister.registerIcons("buildcraft:pipeStructureCobblestone"); + _icons[PipeIconProvider.PipeStructureCobblestone] = iconRegister.registerIcon("buildcraft:pipeStructureCobblestone"); - _icons[PipeIconProvider.PipeItemsCobbleStone] = iconRegister.registerIcons("buildcraft:pipeItemsCobblestone"); + _icons[PipeIconProvider.PipeItemsCobbleStone] = iconRegister.registerIcon("buildcraft:pipeItemsCobblestone"); - _icons[PipeIconProvider.PipeItemsDiamond_Center] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_center"); - _icons[PipeIconProvider.PipeItemsDiamond_Down] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_down"); - _icons[PipeIconProvider.PipeItemsDiamond_Up] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_up"); - _icons[PipeIconProvider.PipeItemsDiamond_North] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_north"); - _icons[PipeIconProvider.PipeItemsDiamond_South] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_south"); - _icons[PipeIconProvider.PipeItemsDiamond_West] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_west"); - _icons[PipeIconProvider.PipeItemsDiamond_East] = iconRegister.registerIcons("buildcraft:pipeItemsDiamond_east"); + _icons[PipeIconProvider.PipeItemsDiamond_Center] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_center"); + _icons[PipeIconProvider.PipeItemsDiamond_Down] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_down"); + _icons[PipeIconProvider.PipeItemsDiamond_Up] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_up"); + _icons[PipeIconProvider.PipeItemsDiamond_North] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_north"); + _icons[PipeIconProvider.PipeItemsDiamond_South] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_south"); + _icons[PipeIconProvider.PipeItemsDiamond_West] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_west"); + _icons[PipeIconProvider.PipeItemsDiamond_East] = iconRegister.registerIcon("buildcraft:pipeItemsDiamond_east"); - _icons[PipeIconProvider.PipeItemsWood_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsWood_standard"); - _icons[PipeIconProvider.PipeAllWood_Solid] = iconRegister.registerIcons("buildcraft:pipeAllWood_solid"); + _icons[PipeIconProvider.PipeItemsWood_Standard] = iconRegister.registerIcon("buildcraft:pipeItemsWood_standard"); + _icons[PipeIconProvider.PipeAllWood_Solid] = iconRegister.registerIcon("buildcraft:pipeAllWood_solid"); - _icons[PipeIconProvider.PipeItemsEmerald_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsEmerald_standard"); - _icons[PipeIconProvider.PipeAllEmerald_Solid] = iconRegister.registerIcons("buildcraft:pipeAllEmerald_solid"); + _icons[PipeIconProvider.PipeItemsEmerald_Standard] = iconRegister.registerIcon("buildcraft:pipeItemsEmerald_standard"); + _icons[PipeIconProvider.PipeAllEmerald_Solid] = iconRegister.registerIcon("buildcraft:pipeAllEmerald_solid"); - _icons[PipeIconProvider.PipeItemsGold] = iconRegister.registerIcons("buildcraft:pipeItemsGold"); + _icons[PipeIconProvider.PipeItemsGold] = iconRegister.registerIcon("buildcraft:pipeItemsGold"); - _icons[PipeIconProvider.PipeItemsIron_Standard] = iconRegister.registerIcons("buildcraft:pipeItemsIron_standard"); - _icons[PipeIconProvider.PipeAllIron_Solid] = iconRegister.registerIcons("buildcraft:pipeAllIron_solid"); + _icons[PipeIconProvider.PipeItemsIron_Standard] = iconRegister.registerIcon("buildcraft:pipeItemsIron_standard"); + _icons[PipeIconProvider.PipeAllIron_Solid] = iconRegister.registerIcon("buildcraft:pipeAllIron_solid"); - _icons[PipeIconProvider.PipeItemsObsidian] = iconRegister.registerIcons("buildcraft:pipeItemsObsidian"); - _icons[PipeIconProvider.PipeItemsSandstone] = iconRegister.registerIcons("buildcraft:pipeItemsSandstone"); - _icons[PipeIconProvider.PipeItemsStone] = iconRegister.registerIcons("buildcraft:pipeItemsStone"); - _icons[PipeIconProvider.PipeItemsVoid] = iconRegister.registerIcons("buildcraft:pipeItemsVoid"); + _icons[PipeIconProvider.PipeItemsObsidian] = iconRegister.registerIcon("buildcraft:pipeItemsObsidian"); + _icons[PipeIconProvider.PipeItemsSandstone] = iconRegister.registerIcon("buildcraft:pipeItemsSandstone"); + _icons[PipeIconProvider.PipeItemsStone] = iconRegister.registerIcon("buildcraft:pipeItemsStone"); + _icons[PipeIconProvider.PipeItemsVoid] = iconRegister.registerIcon("buildcraft:pipeItemsVoid"); - _icons[PipeIconProvider.PipeLiquidsCobblestone] = iconRegister.registerIcons("buildcraft:pipeLiquidsCobblestone"); - _icons[PipeIconProvider.PipeLiquidsWood_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsWood_standard"); - _icons[PipeIconProvider.PipeLiquidsEmerald_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsEmerald_standard"); - _icons[PipeIconProvider.PipeLiquidsGold] = iconRegister.registerIcons("buildcraft:pipeLiquidsGold"); - _icons[PipeIconProvider.PipeLiquidsIron_Standard] = iconRegister.registerIcons("buildcraft:pipeLiquidsIron_standard"); - _icons[PipeIconProvider.PipeLiquidsSandstone] = iconRegister.registerIcons("buildcraft:pipeLiquidsSandstone"); - _icons[PipeIconProvider.PipeLiquidsStone] = iconRegister.registerIcons("buildcraft:pipeLiquidsStone"); - _icons[PipeIconProvider.PipeLiquidsVoid] = iconRegister.registerIcons("buildcraft:pipeLiquidsVoid"); + _icons[PipeIconProvider.PipeLiquidsCobblestone] = iconRegister.registerIcon("buildcraft:pipeLiquidsCobblestone"); + _icons[PipeIconProvider.PipeLiquidsWood_Standard] = iconRegister.registerIcon("buildcraft:pipeLiquidsWood_standard"); + _icons[PipeIconProvider.PipeLiquidsEmerald_Standard] = iconRegister.registerIcon("buildcraft:pipeLiquidsEmerald_standard"); + _icons[PipeIconProvider.PipeLiquidsGold] = iconRegister.registerIcon("buildcraft:pipeLiquidsGold"); + _icons[PipeIconProvider.PipeLiquidsIron_Standard] = iconRegister.registerIcon("buildcraft:pipeLiquidsIron_standard"); + _icons[PipeIconProvider.PipeLiquidsSandstone] = iconRegister.registerIcon("buildcraft:pipeLiquidsSandstone"); + _icons[PipeIconProvider.PipeLiquidsStone] = iconRegister.registerIcon("buildcraft:pipeLiquidsStone"); + _icons[PipeIconProvider.PipeLiquidsVoid] = iconRegister.registerIcon("buildcraft:pipeLiquidsVoid"); - _icons[PipeIconProvider.PipePowerGold] = iconRegister.registerIcons("buildcraft:pipePowerGold"); - _icons[PipeIconProvider.PipePowerStone] = iconRegister.registerIcons("buildcraft:pipePowerStone"); - _icons[PipeIconProvider.PipePowerWood_Standard] = iconRegister.registerIcons("buildcraft:pipePowerWood_standard"); + _icons[PipeIconProvider.PipePowerGold] = iconRegister.registerIcon("buildcraft:pipePowerGold"); + _icons[PipeIconProvider.PipePowerStone] = iconRegister.registerIcon("buildcraft:pipePowerStone"); + _icons[PipeIconProvider.PipePowerWood_Standard] = iconRegister.registerIcon("buildcraft:pipePowerWood_standard"); - _icons[PipeIconProvider.Power_Normal] = iconRegister.registerIcons("buildcraft:texture_cyan"); - _icons[PipeIconProvider.Power_Overload] = iconRegister.registerIcons("buildcraft:texture_red_dark"); + _icons[PipeIconProvider.Power_Normal] = iconRegister.registerIcon("buildcraft:texture_cyan"); + _icons[PipeIconProvider.Power_Overload] = iconRegister.registerIcon("buildcraft:texture_red_dark"); } } diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 10c5a8bc..010a04cb 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -38,14 +38,14 @@ public class WireIconProvider implements IIconProvider { icons = new Icon[MAX]; - icons[WireIconProvider.Texture_Red_Dark] = iconRegister.registerIcons("buildcraft:texture_red_dark"); - icons[WireIconProvider.Texture_Red_Lit] = iconRegister.registerIcons("buildcraft:texture_red_lit"); - icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.registerIcons("buildcraft:texture_blue_dark"); - icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.registerIcons("buildcraft:texture_blue_lit"); - icons[WireIconProvider.Texture_Green_Dark] = iconRegister.registerIcons("buildcraft:texture_green_dark"); - icons[WireIconProvider.Texture_Green_Lit] = iconRegister.registerIcons("buildcraft:texture_green_lit"); - icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.registerIcons("buildcraft:texture_yellow_dark"); - icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.registerIcons("buildcraft:texture_yellow_lit"); + icons[WireIconProvider.Texture_Red_Dark] = iconRegister.registerIcon("buildcraft:texture_red_dark"); + icons[WireIconProvider.Texture_Red_Lit] = iconRegister.registerIcon("buildcraft:texture_red_lit"); + icons[WireIconProvider.Texture_Blue_Dark] = iconRegister.registerIcon("buildcraft:texture_blue_dark"); + icons[WireIconProvider.Texture_Blue_Lit] = iconRegister.registerIcon("buildcraft:texture_blue_lit"); + icons[WireIconProvider.Texture_Green_Dark] = iconRegister.registerIcon("buildcraft:texture_green_dark"); + icons[WireIconProvider.Texture_Green_Lit] = iconRegister.registerIcon("buildcraft:texture_green_lit"); + icons[WireIconProvider.Texture_Yellow_Dark] = iconRegister.registerIcon("buildcraft:texture_yellow_dark"); + icons[WireIconProvider.Texture_Yellow_Lit] = iconRegister.registerIcon("buildcraft:texture_yellow_lit"); } From eb6f7832b8c32e77c84e1549e4892d0b0c41fdfb Mon Sep 17 00:00:00 2001 From: Krapht Date: Fri, 22 Mar 2013 21:52:35 +0100 Subject: [PATCH 35/93] Update forge to 604 Revert Sengir's build.xml Fix Icon registration in Core to use the Item atlas --- build.xml | 4 ++-- buildcraft_resources/build.xml | 4 ++-- common/buildcraft/BuildCraftCore.java | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.xml b/build.xml index 979dfd11..5a8807b3 100644 --- a/build.xml +++ b/build.xml @@ -18,8 +18,8 @@ - - + + diff --git a/buildcraft_resources/build.xml b/buildcraft_resources/build.xml index 1ed2985f..65fad00c 100644 --- a/buildcraft_resources/build.xml +++ b/buildcraft_resources/build.xml @@ -16,8 +16,8 @@ - - + + diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 363ed1a9..562eb79f 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -14,6 +14,7 @@ import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; +import net.minecraft.client.Minecraft; import net.minecraft.command.CommandHandler; import net.minecraft.entity.EntityList; import net.minecraft.item.Item; @@ -320,11 +321,11 @@ public class BuildCraftCore { @ForgeSubscribe @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Pre event){ - //if ("items".equals(event.map.field_94253_b)){ + if (event.map == Minecraft.getMinecraft().renderEngine.textureMapItems) { + //if (event.map.textureType == 1) { 'TODO Replace above iconProvider = new CoreIconProvider(); iconProvider.registerIcons(event.map); - //} - //TODO: this needs un-privating in TextureMap + } } public void loadRecipes() { From dd0122d62201dae5519d10ab281f35add8517a36 Mon Sep 17 00:00:00 2001 From: Krapht Date: Fri, 22 Mar 2013 22:04:00 +0100 Subject: [PATCH 36/93] Fixed the derp reverse of lit/dark gate textures --- common/buildcraft/transport/GateVanilla.java | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common/buildcraft/transport/GateVanilla.java b/common/buildcraft/transport/GateVanilla.java index d45c7bac..8658bfcd 100644 --- a/common/buildcraft/transport/GateVanilla.java +++ b/common/buildcraft/transport/GateVanilla.java @@ -262,24 +262,24 @@ public class GateVanilla extends Gate { if (!hasPulser()){ switch (kind){ case None: return 0; - case Single: return isGateActive ? GateIconProvider.Gate_Dark : GateIconProvider.Gate_Lit; - case AND_2: return isGateActive ? GateIconProvider.Gate_Iron_And_Dark : GateIconProvider.Gate_Iron_And_Lit; - case OR_2: return isGateActive ? GateIconProvider.Gate_Iron_Or_Dark : GateIconProvider.Gate_Iron_Or_Lit; - case AND_3: return isGateActive ? GateIconProvider.Gate_Gold_And_Dark : GateIconProvider.Gate_Gold_And_Lit; - case OR_3: return isGateActive ? GateIconProvider.Gate_Gold_Or_Dark : GateIconProvider.Gate_Gold_Or_Lit; - case AND_4: return isGateActive ? GateIconProvider.Gate_Diamond_And_Dark : GateIconProvider.Gate_Diamond_And_Lit; - case OR_4: return isGateActive ? GateIconProvider.Gate_Diamond_Or_Dark : GateIconProvider.Gate_Diamond_Or_Lit; + case Single: return isGateActive ? GateIconProvider.Gate_Lit : GateIconProvider.Gate_Dark; + case AND_2: return isGateActive ? GateIconProvider.Gate_Iron_And_Lit : GateIconProvider.Gate_Iron_And_Dark; + case OR_2: return isGateActive ? GateIconProvider.Gate_Iron_Or_Lit : GateIconProvider.Gate_Iron_Or_Dark; + case AND_3: return isGateActive ? GateIconProvider.Gate_Gold_And_Lit : GateIconProvider.Gate_Gold_And_Dark; + case OR_3: return isGateActive ? GateIconProvider.Gate_Gold_Or_Lit : GateIconProvider.Gate_Gold_Or_Dark; + case AND_4: return isGateActive ? GateIconProvider.Gate_Diamond_And_Lit : GateIconProvider.Gate_Diamond_And_Dark; + case OR_4: return isGateActive ? GateIconProvider.Gate_Diamond_Or_Lit : GateIconProvider.Gate_Diamond_Or_Dark; } } else { switch (kind){ case None: return 0; - case Single: return isGateActive ? GateIconProvider.Gate_Autarchic_Dark : GateIconProvider.Gate_Autarchic_Lit; - case AND_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_And_Dark : GateIconProvider.Gate_Autarchic_Iron_And_Lit; - case OR_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_Or_Dark : GateIconProvider.Gate_Autarchic_Iron_Or_Lit; - case AND_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_And_Dark : GateIconProvider.Gate_Autarchic_Gold_And_Lit; - case OR_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_Or_Dark : GateIconProvider.Gate_Autarchic_Gold_Or_Lit; - case AND_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_And_Dark : GateIconProvider.Gate_Autarchic_Diamond_And_Lit; - case OR_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_Or_Dark : GateIconProvider.Gate_Autarchic_Diamond_Or_Lit; + case Single: return isGateActive ? GateIconProvider.Gate_Autarchic_Lit : GateIconProvider.Gate_Autarchic_Dark; + case AND_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_And_Lit : GateIconProvider.Gate_Autarchic_Iron_And_Dark; + case OR_2: return isGateActive ? GateIconProvider.Gate_Autarchic_Iron_Or_Lit : GateIconProvider.Gate_Autarchic_Iron_Or_Dark; + case AND_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_And_Lit : GateIconProvider.Gate_Autarchic_Gold_And_Dark; + case OR_3: return isGateActive ? GateIconProvider.Gate_Autarchic_Gold_Or_Lit : GateIconProvider.Gate_Autarchic_Gold_Or_Dark; + case AND_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_And_Lit : GateIconProvider.Gate_Autarchic_Diamond_And_Dark; + case OR_4: return isGateActive ? GateIconProvider.Gate_Autarchic_Diamond_Or_Lit : GateIconProvider.Gate_Autarchic_Diamond_Or_Dark; } } From d888cb7b8d956c16cf14fe4d0bbec023d0587ce6 Mon Sep 17 00:00:00 2001 From: Krapht Date: Fri, 22 Mar 2013 23:00:02 +0100 Subject: [PATCH 37/93] Fixed tank rendering in inventory partially fixed the BlockMarker fixed the template item icons fixed the oil bucket icon Added texture for pipeWaterproofing and moved it to the BC tab --- .../buildcraft/textures/items/pipeWaterproof.png | Bin 0 -> 552 bytes common/buildcraft/BuildCraftTransport.java | 3 ++- common/buildcraft/builders/BlockMarker.java | 10 +++++++++- common/buildcraft/builders/ItemBptBase.java | 7 ------- common/buildcraft/builders/ItemBptTemplate.java | 6 +++--- common/buildcraft/energy/ItemBucketOil.java | 2 +- common/buildcraft/factory/BlockTank.java | 12 ++++++++++++ 7 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/pipeWaterproof.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/pipeWaterproof.png b/buildcraft_resources/mods/buildcraft/textures/items/pipeWaterproof.png new file mode 100644 index 0000000000000000000000000000000000000000..43ae39a65e92476f051ee9af08de98a30ccbbfdd GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)vzVxv;L7Lh_kcpOnIRD+&iT2ysd*(pE(3#eQEFmI zYKlU6W=V#EyQgnJie4%^0|R4^r;B5V#p&M38@;t11={y>CRI!=h>%bEsL)=J#HaK1 zfK!v}qP@MTTZC9IXDEs}NqOczv@Z}de7ZYGP9?!%kKcu;H@=(2tWKvbe#Fl=ZSKtb zXKQwApA73+{qLQm=W^BqpS)!o{%^i6Yo_v}8<7e+* z;`>j8?v|NtqkUtitx?`Npd!_M6L0f62)Ip3Kk711CED=sU1Nqxey7)kF0cPrxU)R* zk{fHoLx&@0#pRP?Ow%j`7+1)zx%v0>UT)?IW?C6{$`%yAT;nKlGDfIRQh! Date: Sat, 23 Mar 2013 09:40:22 +0100 Subject: [PATCH 38/93] Organizing imports --- common/buildcraft/BuildCraftCore.java | 11 +++++------ common/buildcraft/BuildCraftEnergy.java | 1 - common/buildcraft/BuildCraftFactory.java | 1 - common/buildcraft/BuildCraftTransport.java | 4 ---- common/buildcraft/api/filler/IFillerPattern.java | 4 ++-- common/buildcraft/api/gates/ActionManager.java | 2 -- common/buildcraft/api/gates/IAction.java | 2 +- common/buildcraft/api/gates/ITrigger.java | 4 ++-- common/buildcraft/builders/BlockArchitect.java | 6 ++---- .../buildcraft/builders/BlockBlueprintLibrary.java | 6 ++---- common/buildcraft/builders/BlockBuilder.java | 6 ++---- common/buildcraft/builders/BlockFiller.java | 6 ++---- common/buildcraft/builders/BlockMarker.java | 6 ++---- common/buildcraft/builders/BlockPathMarker.java | 5 ++--- common/buildcraft/builders/FillerFillAll.java | 5 ++--- common/buildcraft/builders/FillerFillPyramid.java | 5 ++--- common/buildcraft/builders/FillerFillStairs.java | 5 ++--- common/buildcraft/builders/FillerFillWalls.java | 5 ++--- common/buildcraft/builders/FillerFlattener.java | 5 ++--- common/buildcraft/builders/FillerPattern.java | 4 ++-- common/buildcraft/builders/FillerRemover.java | 5 ++--- common/buildcraft/builders/ItemBptBase.java | 4 ---- common/buildcraft/builders/ItemBptBluePrint.java | 4 ++-- common/buildcraft/core/BlockSpring.java | 5 ++--- common/buildcraft/core/CoreIconProvider.java | 2 +- common/buildcraft/core/CreativeTabBuildCraft.java | 2 +- common/buildcraft/core/EntityBlock.java | 4 ++-- common/buildcraft/core/ItemBuildCraft.java | 4 ++-- common/buildcraft/core/ItemRedstoneChipset.java | 5 ++--- common/buildcraft/core/SpringPopulate.java | 3 +-- common/buildcraft/core/proxy/CoreProxyClient.java | 3 --- .../buildcraft/core/render/RenderEntityBlock.java | 3 --- common/buildcraft/core/render/RenderLaser.java | 1 - common/buildcraft/core/render/RenderRobot.java | 1 - .../core/triggers/ActionMachineControl.java | 4 +--- .../core/triggers/ActionRedstoneOutput.java | 2 -- .../core/triggers/ActionTriggerIconProvider.java | 2 +- common/buildcraft/core/triggers/BCAction.java | 2 +- common/buildcraft/core/triggers/BCTrigger.java | 4 ++-- .../buildcraft/core/triggers/TriggerInventory.java | 6 ++---- .../core/triggers/TriggerLiquidContainer.java | 6 ++---- .../buildcraft/core/triggers/TriggerMachine.java | 6 ++---- common/buildcraft/core/utils/BlockUtil.java | 3 +-- common/buildcraft/energy/BlockEngine.java | 5 ++--- common/buildcraft/energy/BlockOilFlowing.java | 1 - common/buildcraft/energy/BlockOilStill.java | 1 - common/buildcraft/energy/BlockPollution.java | 7 ++----- common/buildcraft/energy/ItemBucketOil.java | 5 ++--- common/buildcraft/energy/OilPopulate.java | 4 ++-- common/buildcraft/energy/TriggerEngineHeat.java | 6 ++---- .../buildcraft/energy/gui/GuiCombustionEngine.java | 3 --- common/buildcraft/energy/render/RenderEngine.java | 1 - common/buildcraft/factory/BlockAutoWorkbench.java | 5 ++--- common/buildcraft/factory/BlockFrame.java | 6 ++---- common/buildcraft/factory/BlockHopper.java | 6 ++---- common/buildcraft/factory/BlockMiningWell.java | 6 ++---- common/buildcraft/factory/BlockPlainPipe.java | 6 ++---- common/buildcraft/factory/BlockPump.java | 6 ++---- common/buildcraft/factory/BlockQuarry.java | 6 ++---- common/buildcraft/factory/BlockRefinery.java | 5 ++--- common/buildcraft/factory/BlockTank.java | 6 ++---- common/buildcraft/factory/EntityMechanicalArm.java | 1 - common/buildcraft/factory/FactoryProxyClient.java | 1 - common/buildcraft/factory/TileAutoWorkbench.java | 3 +-- common/buildcraft/factory/TileHopper.java | 2 +- common/buildcraft/factory/TilePump.java | 1 - common/buildcraft/factory/TileTank.java | 2 +- common/buildcraft/factory/render/RenderHopper.java | 1 - .../buildcraft/factory/render/RenderRefinery.java | 1 - common/buildcraft/factory/render/RenderTank.java | 8 -------- common/buildcraft/silicon/BlockAssemblyTable.java | 6 ++---- common/buildcraft/silicon/BlockLaser.java | 6 ++---- .../silicon/TileAssemblyAdvancedWorkbench.java | 3 +-- .../silicon/gui/GuiAssemblyAdvancedWorkbench.java | 2 +- .../buildcraft/silicon/gui/GuiAssemblyTable.java | 2 +- common/buildcraft/transport/BlockGenericPipe.java | 10 ++-------- common/buildcraft/transport/GateIconProvider.java | 2 +- common/buildcraft/transport/GuiHandler.java | 2 +- common/buildcraft/transport/IPipeRenderState.java | 1 - common/buildcraft/transport/ItemGate.java | 6 ++---- common/buildcraft/transport/ItemPipe.java | 6 +++--- common/buildcraft/transport/Pipe.java | 8 +++----- common/buildcraft/transport/PipeIconProvider.java | 2 +- common/buildcraft/transport/PipeRenderState.java | 7 ++----- .../buildcraft/transport/PipeTransportItems.java | 1 + common/buildcraft/transport/TileGenericPipe.java | 7 ++----- .../buildcraft/transport/TransportProxyClient.java | 3 --- common/buildcraft/transport/WireIconProvider.java | 2 +- .../buildcraft/transport/gui/GuiGateInterface.java | 5 ++--- .../transport/render/TileEntityPickupFX.java | 14 ++++++++------ .../transport/triggers/ActionEnergyPulser.java | 6 ++---- .../transport/triggers/ActionSignalOutput.java | 6 ++---- .../transport/triggers/TriggerPipeContents.java | 6 ++---- .../transport/triggers/TriggerPipeSignal.java | 6 ++---- .../transport/triggers/TriggerRedstoneInput.java | 6 ++---- .../buildcraft/transport/utils/FacadeMatrix.java | 1 - 96 files changed, 138 insertions(+), 267 deletions(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 562eb79f..fd8476ac 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -15,7 +15,6 @@ import java.util.logging.Logger; import net.minecraft.block.Block; import net.minecraft.block.BlockFluid; import net.minecraft.client.Minecraft; -import net.minecraft.command.CommandHandler; import net.minecraft.entity.EntityList; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,7 +22,9 @@ import net.minecraft.util.Icon; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; @@ -32,11 +33,11 @@ import buildcraft.core.BlockIndex; import buildcraft.core.BlockSpring; import buildcraft.core.BuildCraftConfiguration; import buildcraft.core.CommandBuildCraft; +import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; import buildcraft.core.EntityEnergyLaser; import buildcraft.core.EntityPowerLaser; import buildcraft.core.EntityRobot; -import buildcraft.core.CoreIconProvider; import buildcraft.core.ItemBuildCraft; import buildcraft.core.ItemWrench; import buildcraft.core.RedstonePowerFramework; @@ -50,12 +51,12 @@ import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.triggers.ActionMachineControl.Mode; +import buildcraft.core.triggers.ActionRedstoneOutput; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCAction; -import buildcraft.core.triggers.ActionRedstoneOutput; +import buildcraft.core.triggers.BCTrigger; import buildcraft.core.triggers.DefaultActionProvider; import buildcraft.core.triggers.DefaultTriggerProvider; -import buildcraft.core.triggers.BCTrigger; import buildcraft.core.triggers.TriggerInventory; import buildcraft.core.triggers.TriggerLiquidContainer; import buildcraft.core.triggers.TriggerMachine; @@ -79,8 +80,6 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.ForgeSubscribe; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", dependencies = "required-after:Forge@[6.5.0.0,)") @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandler.class, clientSideRequired = true, serverSideRequired = true) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 0233570e..c178fb0c 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -12,7 +12,6 @@ import java.util.TreeMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 9ee94192..340da1ee 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -13,7 +13,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeChunkManager; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 66d65c2d..c30f92d3 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -13,10 +13,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; @@ -97,8 +95,6 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @Mod(version = Version.VERSION, modid = "BuildCraft|Transport", name = "Buildcraft Transport", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandlerTransport.class) diff --git a/common/buildcraft/api/filler/IFillerPattern.java b/common/buildcraft/api/filler/IFillerPattern.java index 862742b7..71b1e411 100644 --- a/common/buildcraft/api/filler/IFillerPattern.java +++ b/common/buildcraft/api/filler/IFillerPattern.java @@ -1,11 +1,11 @@ package buildcraft.api.filler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public interface IFillerPattern { diff --git a/common/buildcraft/api/gates/ActionManager.java b/common/buildcraft/api/gates/ActionManager.java index 4c79dede..34a558ec 100644 --- a/common/buildcraft/api/gates/ActionManager.java +++ b/common/buildcraft/api/gates/ActionManager.java @@ -5,8 +5,6 @@ import java.util.LinkedList; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import buildcraft.api.transport.IPipe; -import buildcraft.core.triggers.BCAction; -import buildcraft.core.triggers.BCTrigger; public class ActionManager { diff --git a/common/buildcraft/api/gates/IAction.java b/common/buildcraft/api/gates/IAction.java index c57efc69..80c68657 100644 --- a/common/buildcraft/api/gates/IAction.java +++ b/common/buildcraft/api/gates/IAction.java @@ -1,9 +1,9 @@ package buildcraft.api.gates; +import net.minecraft.util.Icon; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; public interface IAction { diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java index 017e7ec2..4095b2f4 100644 --- a/common/buildcraft/api/gates/ITrigger.java +++ b/common/buildcraft/api/gates/ITrigger.java @@ -1,10 +1,10 @@ package buildcraft.api.gates; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; public interface ITrigger { diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index 289fca1a..aa176351 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -30,10 +27,11 @@ import buildcraft.BuildCraftBuilders; import buildcraft.api.core.Position; import buildcraft.api.tools.IToolWrench; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockArchitect extends BlockContainer { diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index cf0c4318..7f3d443d 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -25,9 +22,10 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockBlueprintLibrary extends BlockContainer { diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 4161befb..1bd86ba1 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -29,10 +26,11 @@ import buildcraft.BuildCraftBuilders; import buildcraft.api.core.Position; import buildcraft.api.tools.IToolWrench; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockBuilder extends BlockContainer { diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index c0ee0daf..2c4b0e53 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -26,10 +23,11 @@ import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.api.filler.IFillerPattern; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockFiller extends BlockContainer { diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index 02c7395b..d327a860 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -30,8 +27,9 @@ import net.minecraft.world.World; import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftCore; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockMarker extends BlockContainer { diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index 249afe33..23595389 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -11,9 +11,6 @@ package buildcraft.builders; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,6 +18,8 @@ import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPathMarker extends BlockMarker { diff --git a/common/buildcraft/builders/FillerFillAll.java b/common/buildcraft/builders/FillerFillAll.java index 05ded6e8..b74c271a 100644 --- a/common/buildcraft/builders/FillerFillAll.java +++ b/common/buildcraft/builders/FillerFillAll.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillAll extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillPyramid.java b/common/buildcraft/builders/FillerFillPyramid.java index d3d8f79f..293348a2 100644 --- a/common/buildcraft/builders/FillerFillPyramid.java +++ b/common/buildcraft/builders/FillerFillPyramid.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillPyramid extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillStairs.java b/common/buildcraft/builders/FillerFillStairs.java index 6f398860..dca31535 100644 --- a/common/buildcraft/builders/FillerFillStairs.java +++ b/common/buildcraft/builders/FillerFillStairs.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillStairs extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFillWalls.java b/common/buildcraft/builders/FillerFillWalls.java index 59f5b674..f057e14a 100644 --- a/common/buildcraft/builders/FillerFillWalls.java +++ b/common/buildcraft/builders/FillerFillWalls.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFillWalls extends FillerPattern { diff --git a/common/buildcraft/builders/FillerFlattener.java b/common/buildcraft/builders/FillerFlattener.java index b278dbe3..19725688 100644 --- a/common/buildcraft/builders/FillerFlattener.java +++ b/common/buildcraft/builders/FillerFlattener.java @@ -9,15 +9,14 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerFlattener extends FillerPattern { diff --git a/common/buildcraft/builders/FillerPattern.java b/common/buildcraft/builders/FillerPattern.java index af060b07..68b72660 100644 --- a/common/buildcraft/builders/FillerPattern.java +++ b/common/buildcraft/builders/FillerPattern.java @@ -9,8 +9,6 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; @@ -20,6 +18,8 @@ import buildcraft.api.core.IBox; import buildcraft.api.filler.IFillerPattern; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class FillerPattern implements IFillerPattern { diff --git a/common/buildcraft/builders/FillerRemover.java b/common/buildcraft/builders/FillerRemover.java index 68b1b08a..226ab765 100644 --- a/common/buildcraft/builders/FillerRemover.java +++ b/common/buildcraft/builders/FillerRemover.java @@ -9,13 +9,12 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import buildcraft.api.core.IBox; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class FillerRemover extends FillerPattern { diff --git a/common/buildcraft/builders/ItemBptBase.java b/common/buildcraft/builders/ItemBptBase.java index 9d89570a..44509d71 100644 --- a/common/buildcraft/builders/ItemBptBase.java +++ b/common/buildcraft/builders/ItemBptBase.java @@ -11,10 +11,6 @@ package buildcraft.builders; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/builders/ItemBptBluePrint.java b/common/buildcraft/builders/ItemBptBluePrint.java index b9e76c34..7c97379e 100644 --- a/common/buildcraft/builders/ItemBptBluePrint.java +++ b/common/buildcraft/builders/ItemBptBluePrint.java @@ -9,10 +9,10 @@ package buildcraft.builders; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBptBluePrint extends ItemBptBase { diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index 02b19630..72bd0434 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -2,13 +2,12 @@ package buildcraft.core; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockSpring extends Block { diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 23c1497f..69de9650 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.core; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class CoreIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/CreativeTabBuildCraft.java b/common/buildcraft/core/CreativeTabBuildCraft.java index dcb77115..d0e81c30 100644 --- a/common/buildcraft/core/CreativeTabBuildCraft.java +++ b/common/buildcraft/core/CreativeTabBuildCraft.java @@ -1,8 +1,8 @@ package buildcraft.core; -import buildcraft.BuildCraftCore; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import buildcraft.BuildCraftCore; public class CreativeTabBuildCraft extends CreativeTabs { diff --git a/common/buildcraft/core/EntityBlock.java b/common/buildcraft/core/EntityBlock.java index 118ea6d0..2ca8871f 100644 --- a/common/buildcraft/core/EntityBlock.java +++ b/common/buildcraft/core/EntityBlock.java @@ -9,12 +9,12 @@ package buildcraft.core; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EntityBlock extends Entity { diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index 9a8fe405..04fc657e 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -9,12 +9,12 @@ package buildcraft.core; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import buildcraft.core.utils.StringUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBuildCraft extends Item { diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index c6a39fcd..374180f1 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -2,13 +2,12 @@ package buildcraft.core; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemRedstoneChipset extends ItemBuildCraft { diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index 9ef30faa..309692d3 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -9,14 +9,13 @@ package buildcraft.core; import java.util.Random; -import buildcraft.BuildCraftCore; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; +import buildcraft.BuildCraftCore; public class SpringPopulate { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index c6e14d0f..cea72fab 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.RenderEngine; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -28,9 +27,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.StringTranslate; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.EntityBlock; import buildcraft.core.EntityEnergyLaser; import buildcraft.core.EntityPowerLaser; diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/render/RenderEntityBlock.java index aad4bf4b..75181375 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/render/RenderEntityBlock.java @@ -10,7 +10,6 @@ package buildcraft.core.render; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -18,11 +17,9 @@ import net.minecraft.entity.Entity; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; -import buildcraft.core.DefaultProps; import buildcraft.core.EntityBlock; public class RenderEntityBlock extends Render { diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index c7ff3b38..82052715 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -4,7 +4,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/core/render/RenderRobot.java b/common/buildcraft/core/render/RenderRobot.java index d191fe1a..f2ea96c7 100644 --- a/common/buildcraft/core/render/RenderRobot.java +++ b/common/buildcraft/core/render/RenderRobot.java @@ -4,7 +4,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/core/triggers/ActionMachineControl.java b/common/buildcraft/core/triggers/ActionMachineControl.java index b609d636..a8ba5bc0 100644 --- a/common/buildcraft/core/triggers/ActionMachineControl.java +++ b/common/buildcraft/core/triggers/ActionMachineControl.java @@ -1,10 +1,8 @@ package buildcraft.core.triggers; +import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; public class ActionMachineControl extends BCAction { diff --git a/common/buildcraft/core/triggers/ActionRedstoneOutput.java b/common/buildcraft/core/triggers/ActionRedstoneOutput.java index 199e7b9b..93364bf4 100644 --- a/common/buildcraft/core/triggers/ActionRedstoneOutput.java +++ b/common/buildcraft/core/triggers/ActionRedstoneOutput.java @@ -12,8 +12,6 @@ package buildcraft.core.triggers; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; public class ActionRedstoneOutput extends BCAction { diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index 6a01d88c..3901fd4b 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.core.triggers; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class ActionTriggerIconProvider implements IIconProvider { diff --git a/common/buildcraft/core/triggers/BCAction.java b/common/buildcraft/core/triggers/BCAction.java index 2feb3fd1..a46683fd 100644 --- a/common/buildcraft/core/triggers/BCAction.java +++ b/common/buildcraft/core/triggers/BCAction.java @@ -9,13 +9,13 @@ package buildcraft.core.triggers; +import net.minecraft.util.Icon; import buildcraft.BuildCraftCore; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; public abstract class BCAction implements IAction { diff --git a/common/buildcraft/core/triggers/BCTrigger.java b/common/buildcraft/core/triggers/BCTrigger.java index 7e607abf..8aff1721 100644 --- a/common/buildcraft/core/triggers/BCTrigger.java +++ b/common/buildcraft/core/triggers/BCTrigger.java @@ -9,6 +9,8 @@ package buildcraft.core.triggers; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; import buildcraft.BuildCraftCore; import buildcraft.api.core.IIconProvider; import buildcraft.api.gates.ActionManager; @@ -17,8 +19,6 @@ import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.TriggerParameter; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; /** * This class has to be implemented to create new triggers kinds to BuildCraft gates. There is an instance per kind, which will get called wherever the trigger diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index 515d95f0..d77c6a3a 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -9,20 +9,18 @@ package buildcraft.core.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerDirectional; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.SidedInventoryAdapter; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerInventory extends BCTrigger implements ITriggerDirectional { diff --git a/common/buildcraft/core/triggers/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java index 35153105..6aef454d 100644 --- a/common/buildcraft/core/triggers/TriggerLiquidContainer.java +++ b/common/buildcraft/core/triggers/TriggerLiquidContainer.java @@ -9,8 +9,6 @@ package buildcraft.core.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; @@ -18,9 +16,9 @@ import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerLiquidContainer extends BCTrigger { diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 132b2186..556df3fe 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -9,14 +9,12 @@ package buildcraft.core.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.IMachine; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerMachine extends BCTrigger { diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java index 12cbe5c3..bd9bd1bf 100644 --- a/common/buildcraft/core/utils/BlockUtil.java +++ b/common/buildcraft/core/utils/BlockUtil.java @@ -10,8 +10,6 @@ package buildcraft.core.utils; import java.util.List; -import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +22,7 @@ import net.minecraft.world.World; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; import buildcraft.api.core.BuildCraftAPI; +import cpw.mods.fml.common.FMLCommonHandler; public class BlockUtil { diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 5c690db0..419a9cfb 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -12,9 +12,6 @@ package buildcraft.energy; import java.util.List; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -32,6 +29,8 @@ import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockEngine extends BlockContainer { diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index b1fc5449..d36fd971 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -18,7 +18,6 @@ import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; -import buildcraft.core.DefaultProps; public class BlockOilFlowing extends BlockFluid implements ILiquid { diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index 5245e302..8b33d7a8 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -15,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; -import buildcraft.core.DefaultProps; public class BlockOilStill extends BlockStationary implements ILiquid { diff --git a/common/buildcraft/energy/BlockPollution.java b/common/buildcraft/energy/BlockPollution.java index e579e7bd..5b3887c4 100644 --- a/common/buildcraft/energy/BlockPollution.java +++ b/common/buildcraft/energy/BlockPollution.java @@ -9,16 +9,13 @@ package buildcraft.energy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPollution extends BlockContainer { diff --git a/common/buildcraft/energy/ItemBucketOil.java b/common/buildcraft/energy/ItemBucketOil.java index 894320f2..eb617b09 100644 --- a/common/buildcraft/energy/ItemBucketOil.java +++ b/common/buildcraft/energy/ItemBucketOil.java @@ -9,15 +9,14 @@ package buildcraft.energy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import buildcraft.BuildCraftEnergy; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.StringUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBucketOil extends ItemBucket { diff --git a/common/buildcraft/energy/OilPopulate.java b/common/buildcraft/energy/OilPopulate.java index 3bcef8f6..c7ce17aa 100644 --- a/common/buildcraft/energy/OilPopulate.java +++ b/common/buildcraft/energy/OilPopulate.java @@ -12,11 +12,11 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftEnergy; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; +import buildcraft.BuildCraftCore; +import buildcraft.BuildCraftEnergy; public class OilPopulate { diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java index db723c3c..57b466a3 100644 --- a/common/buildcraft/energy/TriggerEngineHeat.java +++ b/common/buildcraft/energy/TriggerEngineHeat.java @@ -9,15 +9,13 @@ package buildcraft.energy; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerEngineHeat extends BCTrigger { diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index 0473f6a9..c0db49db 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -9,10 +9,7 @@ package buildcraft.energy.gui; -import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.Item; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index 304a211b..4e965087 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index 89c61258..872451b4 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +23,8 @@ import buildcraft.core.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockAutoWorkbench extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index f3c59261..d7dfcca7 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -13,9 +13,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -27,9 +24,10 @@ import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.IFramePipeConnection; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockFrame extends Block implements IFramePipeConnection { diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index fe8d6f17..254c47fd 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -2,15 +2,11 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; @@ -18,6 +14,8 @@ import buildcraft.core.BlockBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.IItemPipe; import buildcraft.core.proxy.CoreProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockHopper extends BlockBuildCraft { diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 2ef00f97..afbcee18 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLiving; @@ -24,8 +21,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockMiningWell extends BlockMachineRoot { diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index 92016cf9..a70cf2e6 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -12,17 +12,15 @@ package buildcraft.factory; import java.util.ArrayList; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import buildcraft.core.DefaultProps; import buildcraft.core.IFramePipeConnection; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPlainPipe extends Block implements IFramePipeConnection { diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index fe195834..d580920b 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -22,8 +19,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPump extends BlockContainer { diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 6d71933e..3e4704ea 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLiving; @@ -28,9 +25,10 @@ import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; import buildcraft.api.tools.IToolWrench; import buildcraft.core.Box; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockQuarry extends BlockMachineRoot { diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index 9c0d8f01..bcbb2f74 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -34,6 +31,8 @@ import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.GuiIds; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockRefinery extends BlockContainer { diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index db4a03d2..7998573e 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -11,9 +11,6 @@ package buildcraft.factory; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -28,8 +25,9 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import buildcraft.BuildCraftCore; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockTank extends BlockContainer { diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java index a0b1104c..6137e288 100644 --- a/common/buildcraft/factory/EntityMechanicalArm.java +++ b/common/buildcraft/factory/EntityMechanicalArm.java @@ -13,7 +13,6 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import buildcraft.BuildCraftFactory; import buildcraft.core.EntityBlock; public class EntityMechanicalArm extends Entity { diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 0597c045..faae3588 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -6,7 +6,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.Icon; import net.minecraft.world.World; - import buildcraft.BuildCraftCore; import buildcraft.BuildCraftFactory; import buildcraft.core.EntityBlock; diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 7f3cc17e..170ca502 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -16,7 +16,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -28,9 +27,9 @@ import buildcraft.api.core.Position; import buildcraft.api.inventory.ISpecialInventory; import buildcraft.core.inventory.TransactorRoundRobin; import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.CraftingHelper; import buildcraft.core.utils.SidedInventoryAdapter; import buildcraft.core.utils.Utils; -import buildcraft.core.utils.CraftingHelper; public class TileAutoWorkbench extends TileEntity implements ISpecialInventory { diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index d88e0949..c476b953 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -6,9 +6,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import buildcraft.core.TileBuildCraft; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; -import buildcraft.core.TileBuildCraft; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.SimpleInventory; diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index b3ad8813..0f1d8471 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -23,7 +23,6 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; import buildcraft.BuildCraftCore; -import buildcraft.BuildCraftFactory; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 2e50da29..6ccd32e4 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -8,6 +8,7 @@ package buildcraft.factory; import static net.minecraftforge.common.ForgeDirection.DOWN; +import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -23,7 +24,6 @@ import buildcraft.core.TileBuildCraft; import buildcraft.core.network.PacketPayload; import buildcraft.core.network.PacketUpdate; import buildcraft.core.proxy.CoreProxy; -import net.minecraft.item.Item; public class TileTank extends TileBuildCraft implements ITankContainer { diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index e8e93f7e..0b855d2a 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index 8eb66de9..bef16b51 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index ae64d980..9d137daf 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -9,26 +9,18 @@ package buildcraft.factory.render; -import java.util.Arrays; import java.util.HashMap; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; -import com.google.common.base.Joiner; -import com.google.common.primitives.Ints; -import com.google.common.primitives.Primitives; - import buildcraft.core.render.RenderEntityBlock; import buildcraft.core.render.RenderEntityBlock.BlockInterface; import buildcraft.factory.TileTank; diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index 2abc72c4..a66c7a94 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -2,9 +2,6 @@ package buildcraft.silicon; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -16,9 +13,10 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftSilicon; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockAssemblyTable extends BlockContainer { diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index 60ab4379..cba892e3 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -11,9 +11,6 @@ package buildcraft.silicon; import java.util.ArrayList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -23,7 +20,8 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.core.CreativeTabBuildCraft; -import buildcraft.core.DefaultProps; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockLaser extends BlockContainer { diff --git a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java index 04c8f17b..16ead5c0 100644 --- a/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/TileAssemblyAdvancedWorkbench.java @@ -11,7 +11,6 @@ import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -22,9 +21,9 @@ import buildcraft.core.IMachine; import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketSlotChange; import buildcraft.core.proxy.CoreProxy; +import buildcraft.core.utils.CraftingHelper; import buildcraft.core.utils.SimpleInventory; import buildcraft.core.utils.Utils; -import buildcraft.core.utils.CraftingHelper; import com.google.common.collect.Lists; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java index 2d694495..55a9567d 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyAdvancedWorkbench.java @@ -9,8 +9,8 @@ import net.minecraft.item.crafting.IRecipe; import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftCore; -import buildcraft.core.DefaultProps; import buildcraft.core.CoreIconProvider; +import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtil; import buildcraft.silicon.TileAssemblyAdvancedWorkbench; diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 0afe8355..8ee5e60b 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -20,8 +20,8 @@ import org.lwjgl.opengl.GL11; import buildcraft.BuildCraftCore; import buildcraft.api.recipes.AssemblyRecipe; -import buildcraft.core.DefaultProps; import buildcraft.core.CoreIconProvider; +import buildcraft.core.DefaultProps; import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.network.PacketCoordinates; import buildcraft.core.network.PacketIds; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index b6f87d5e..3ffe6c1a 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -14,9 +14,6 @@ import java.util.List; import java.util.Random; import java.util.TreeMap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -36,18 +33,15 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; -import buildcraft.api.gates.ActionManager; -import buildcraft.api.gates.IAction; -import buildcraft.api.gates.ITrigger; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipe; import buildcraft.core.BlockIndex; -import buildcraft.core.DefaultProps; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; import buildcraft.transport.render.PipeWorldRenderer; -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockGenericPipe extends BlockContainer { static enum Part { diff --git a/common/buildcraft/transport/GateIconProvider.java b/common/buildcraft/transport/GateIconProvider.java index eec13b8d..0e62c9aa 100644 --- a/common/buildcraft/transport/GateIconProvider.java +++ b/common/buildcraft/transport/GateIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class GateIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/GuiHandler.java b/common/buildcraft/transport/GuiHandler.java index 35d2cb65..7beeb17c 100644 --- a/common/buildcraft/transport/GuiHandler.java +++ b/common/buildcraft/transport/GuiHandler.java @@ -1,6 +1,7 @@ package buildcraft.transport; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import buildcraft.core.GuiIds; @@ -12,7 +13,6 @@ import buildcraft.transport.gui.GuiEmeraldPipe; import buildcraft.transport.gui.GuiGateInterface; import buildcraft.transport.pipes.PipeLogicDiamond; import cpw.mods.fml.common.network.IGuiHandler; -import net.minecraft.inventory.IInventory; public class GuiHandler implements IGuiHandler { diff --git a/common/buildcraft/transport/IPipeRenderState.java b/common/buildcraft/transport/IPipeRenderState.java index 8c748259..3170b31c 100644 --- a/common/buildcraft/transport/IPipeRenderState.java +++ b/common/buildcraft/transport/IPipeRenderState.java @@ -3,7 +3,6 @@ package buildcraft.transport; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.Icon; public interface IPipeRenderState { public PipeRenderState getRenderState(); diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 65bca78f..5474cc7e 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -2,19 +2,17 @@ package buildcraft.transport; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemBuildCraft; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemGate extends ItemBuildCraft { diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index 5cea1bd7..01abc785 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -9,20 +9,20 @@ package buildcraft.transport; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; +import buildcraft.BuildCraftCore; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.IItemPipe; import buildcraft.core.ItemBuildCraft; -import buildcraft.BuildCraftCore; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemPipe extends ItemBuildCraft implements IItemPipe { diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 410b1e24..640082a4 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -14,9 +14,6 @@ import java.util.LinkedList; import java.util.Map; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; @@ -24,7 +21,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftTransport; @@ -40,13 +36,15 @@ import buildcraft.api.gates.TriggerParameter; import buildcraft.api.transport.IPipe; import buildcraft.core.IDropControlInventory; import buildcraft.core.network.TilePacketWrapper; -import buildcraft.core.triggers.BCAction; import buildcraft.core.triggers.ActionRedstoneOutput; +import buildcraft.core.triggers.BCAction; import buildcraft.core.triggers.BCTrigger; import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateConditional; import buildcraft.transport.pipes.PipeLogic; import buildcraft.transport.triggers.ActionSignalOutput; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class Pipe implements IPipe, IDropControlInventory { diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index f231d7b5..f6f3f38c 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class PipeIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index 9d83e485..e283b30a 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -4,17 +4,14 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.util.Icon; - -import buildcraft.core.DefaultProps; import buildcraft.core.network.IClientState; import buildcraft.transport.utils.ConnectionMatrix; import buildcraft.transport.utils.FacadeMatrix; import buildcraft.transport.utils.TextureMatrix; import buildcraft.transport.utils.WireMatrix; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PipeRenderState implements IClientState { diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index f67cdffb..e8878a63 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -18,6 +18,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; + import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 1c7286d8..267ac8e7 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -14,15 +14,11 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.LinkedList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; @@ -38,7 +34,6 @@ import buildcraft.api.gates.ITrigger; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.transport.IPipe; -import buildcraft.api.transport.IPipe.WireColor; import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeEntry; import buildcraft.api.transport.IPipeTile; @@ -54,6 +49,8 @@ import buildcraft.core.network.PacketTileState; import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateKind; import buildcraft.transport.network.PipeRenderStatePacket; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITankContainer, IPipeEntry, IPipeTile, IOverrideDefaultTriggers, ITileBufferHolder, IPipeConnection, IDropControlInventory, IPipeRenderState, ISyncedTile { diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index 88bb0a4e..6741010f 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -1,8 +1,5 @@ package buildcraft.transport; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.Icon; import net.minecraftforge.client.MinecraftForgeClient; import buildcraft.BuildCraftTransport; import buildcraft.transport.render.FacadeItemRenderer; diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 010a04cb..f9e6dbe6 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -2,9 +2,9 @@ package buildcraft.transport; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.util.Icon; +import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.core.IIconProvider; public class WireIconProvider implements IIconProvider { diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index d53abad5..ac0a2f39 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -17,9 +17,6 @@ import net.minecraft.util.Icon; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.gates.IAction; import buildcraft.api.gates.ITrigger; import buildcraft.api.gates.ITriggerParameter; @@ -27,6 +24,8 @@ import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.utils.StringUtil; import buildcraft.transport.Gate.GateKind; import buildcraft.transport.Pipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class GuiGateInterface extends GuiAdvancedInterface { diff --git a/common/buildcraft/transport/render/TileEntityPickupFX.java b/common/buildcraft/transport/render/TileEntityPickupFX.java index bacc8136..99132974 100644 --- a/common/buildcraft/transport/render/TileEntityPickupFX.java +++ b/common/buildcraft/transport/render/TileEntityPickupFX.java @@ -11,19 +11,21 @@ */ package buildcraft.transport.render; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.EntityPickupFX; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + import buildcraft.core.utils.Utils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class TileEntityPickupFX extends EntityFX diff --git a/common/buildcraft/transport/triggers/ActionEnergyPulser.java b/common/buildcraft/transport/triggers/ActionEnergyPulser.java index 5b8aca85..cac78ac1 100644 --- a/common/buildcraft/transport/triggers/ActionEnergyPulser.java +++ b/common/buildcraft/transport/triggers/ActionEnergyPulser.java @@ -1,12 +1,10 @@ package buildcraft.transport.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCAction; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ActionEnergyPulser extends BCAction { diff --git a/common/buildcraft/transport/triggers/ActionSignalOutput.java b/common/buildcraft/transport/triggers/ActionSignalOutput.java index 8fb7feeb..7aa68128 100644 --- a/common/buildcraft/transport/triggers/ActionSignalOutput.java +++ b/common/buildcraft/transport/triggers/ActionSignalOutput.java @@ -10,13 +10,11 @@ package buildcraft.transport.triggers; import net.minecraft.util.Icon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.BuildCraftTransport; import buildcraft.api.transport.IPipe; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCAction; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ActionSignalOutput extends BCAction { diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index fc562626..982e2c08 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -9,16 +9,12 @@ package buildcraft.transport.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.EntityData; @@ -27,6 +23,8 @@ import buildcraft.transport.Pipe; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.PipeTransportLiquids; import buildcraft.transport.PipeTransportPower; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerPipeContents extends BCTrigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java index 515cabfe..d8187e7b 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -9,17 +9,15 @@ package buildcraft.transport.triggers; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.util.Icon; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.transport.IPipe; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.ITriggerPipe; import buildcraft.transport.Pipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerPipeSignal extends BCTrigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java index 56352739..897f502a 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -10,15 +10,13 @@ package buildcraft.transport.triggers; import net.minecraft.util.Icon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.BuildCraftTransport; import buildcraft.api.gates.ITriggerParameter; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import buildcraft.transport.ITriggerPipe; import buildcraft.transport.Pipe; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TriggerRedstoneInput extends BCTrigger implements ITriggerPipe { diff --git a/common/buildcraft/transport/utils/FacadeMatrix.java b/common/buildcraft/transport/utils/FacadeMatrix.java index d247f1ae..f94e5555 100644 --- a/common/buildcraft/transport/utils/FacadeMatrix.java +++ b/common/buildcraft/transport/utils/FacadeMatrix.java @@ -4,7 +4,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; public class FacadeMatrix extends ConnectionMatrix { From 6cfabf56aff4c0b5d6e099ae3d7ea28745da09fa Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 23 Mar 2013 02:16:17 -0700 Subject: [PATCH 39/93] Merged Trigger APIs --- common/buildcraft/api/gates/ITrigger.java | 2 +- .../api/gates/ITriggerDirectional.java | 18 ------------------ common/buildcraft/transport/Pipe.java | 6 +----- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 common/buildcraft/api/gates/ITriggerDirectional.java diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java index 4095b2f4..80357c7c 100644 --- a/common/buildcraft/api/gates/ITrigger.java +++ b/common/buildcraft/api/gates/ITrigger.java @@ -32,7 +32,7 @@ public interface ITrigger { /** * Return true if the tile given in parameter activates the trigger, given the parameters. */ - public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter); + public abstract boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter); /** * Create parameters for the trigger. As for now, there is only one kind of trigger parameter available so this subprogram is final. diff --git a/common/buildcraft/api/gates/ITriggerDirectional.java b/common/buildcraft/api/gates/ITriggerDirectional.java deleted file mode 100644 index 344e168b..00000000 --- a/common/buildcraft/api/gates/ITriggerDirectional.java +++ /dev/null @@ -1,18 +0,0 @@ -package buildcraft.api.gates; - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; - -// TODO: Merge with ITrigger - -/** - * This interface was added to expand on the existing Trigger interface without breaking the API. At some point when it is safe to break the API, this function - * should replace the one in ITrigger. - */ -public interface ITriggerDirectional extends ITrigger { - - /** - * Return true if the tile given in parameter activates the trigger, given the parameters. - */ - public abstract boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter); -} diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 640082a4..43e00990 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -30,7 +30,6 @@ import buildcraft.api.gates.ActionManager; import buildcraft.api.gates.IAction; import buildcraft.api.gates.IActionReceptor; import buildcraft.api.gates.ITrigger; -import buildcraft.api.gates.ITriggerDirectional; import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.TriggerParameter; import buildcraft.api.transport.IPipe; @@ -491,10 +490,7 @@ public abstract class Pipe implements IPipe, IDropControlInventory { TileEntity tile = container.getTile(o); if (tile != null && !(tile instanceof TileGenericPipe)) { - if (trigger instanceof ITriggerDirectional) { - if (((ITriggerDirectional) trigger).isTriggerActive(o.getOpposite(), tile, parameter)) - return true; - } else if (trigger.isTriggerActive(tile, parameter)) + if (trigger.isTriggerActive(o.getOpposite(), tile, parameter)) return true; } } From da3aa8374b3a9aa06851e3b7038e8738c3227b0c Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 23 Mar 2013 02:21:06 -0700 Subject: [PATCH 40/93] Mass Cleaning & Updating --- .../buildcraft/api/transport/IPipedItem.java | 26 ---------- common/buildcraft/core/EntityPassiveItem.java | 50 ------------------- .../core/triggers/TriggerInventory.java | 8 +-- .../core/triggers/TriggerLiquidContainer.java | 2 +- .../core/triggers/TriggerMachine.java | 2 +- .../triggers/TriggerPipeContents.java | 2 +- .../transport/triggers/TriggerPipeSignal.java | 2 +- .../triggers/TriggerRedstoneInput.java | 2 +- 8 files changed, 6 insertions(+), 88 deletions(-) diff --git a/common/buildcraft/api/transport/IPipedItem.java b/common/buildcraft/api/transport/IPipedItem.java index 31df98f1..272cad11 100644 --- a/common/buildcraft/api/transport/IPipedItem.java +++ b/common/buildcraft/api/transport/IPipedItem.java @@ -53,32 +53,6 @@ public interface IPipedItem { */ public abstract void setContainer(TileEntity container); - /** - * @return the synchroTracker - */ - @Deprecated - public abstract SafeTimeTracker getSynchroTracker(); - - /** - * @param synchroTracker - * the synchroTracker to set - */ - @Deprecated - public abstract void setSynchroTracker(SafeTimeTracker synchroTracker); - - /** - * @return the deterministicRandomization - */ - @Deprecated - public abstract int getDeterministicRandomization(); - - /** - * @param deterministicRandomization - * the deterministicRandomization to set - */ - @Deprecated - public abstract void setDeterministicRandomization(int deterministicRandomization); - /** * @return the entityId */ diff --git a/common/buildcraft/core/EntityPassiveItem.java b/common/buildcraft/core/EntityPassiveItem.java index a497fceb..1b9bd8a6 100644 --- a/common/buildcraft/core/EntityPassiveItem.java +++ b/common/buildcraft/core/EntityPassiveItem.java @@ -38,12 +38,6 @@ public class EntityPassiveItem implements IPipedItem { protected TileEntity container; - @Deprecated - protected SafeTimeTracker synchroTracker = new SafeTimeTracker(); - - @Deprecated - protected int deterministicRandomization = 0; - protected Position position; protected int entityId; @@ -181,50 +175,6 @@ public class EntityPassiveItem implements IPipedItem { this.container = container; } - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.IPipedItem#getSynchroTracker() - */ - @Override - @Deprecated - public SafeTimeTracker getSynchroTracker() { - return synchroTracker; - } - - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.IPipedItem#setSynchroTracker(net.minecraft.src.buildcraft.api.SafeTimeTracker) - */ - @Override - @Deprecated - public void setSynchroTracker(SafeTimeTracker synchroTracker) { - this.synchroTracker = synchroTracker; - } - - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.IPipedItem#getDeterministicRandomization() - */ - @Override - @Deprecated - public int getDeterministicRandomization() { - return deterministicRandomization; - } - - /* - * (non-Javadoc) - * - * @see net.minecraft.src.buildcraft.api.IPipedItem#setDeterministicRandomization(int) - */ - @Override - @Deprecated - public void setDeterministicRandomization(int deterministicRandomization) { - this.deterministicRandomization = deterministicRandomization; - } - /* * (non-Javadoc) * diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index d77c6a3a..d6142f65 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -15,14 +15,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; -import buildcraft.api.gates.ITriggerDirectional; import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.utils.SidedInventoryAdapter; import buildcraft.core.utils.Utils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TriggerInventory extends BCTrigger implements ITriggerDirectional { +public class TriggerInventory extends BCTrigger { public enum State { Empty, Contains, Space, Full @@ -115,11 +114,6 @@ public class TriggerInventory extends BCTrigger implements ITriggerDirectional { return false; } - @Override - public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) { - return isTriggerActive(ForgeDirection.UNKNOWN, tile, parameter); - } - @Override @SideOnly(Side.CLIENT) public Icon getTextureIcon() { diff --git a/common/buildcraft/core/triggers/TriggerLiquidContainer.java b/common/buildcraft/core/triggers/TriggerLiquidContainer.java index 6aef454d..0d50bc83 100644 --- a/common/buildcraft/core/triggers/TriggerLiquidContainer.java +++ b/common/buildcraft/core/triggers/TriggerLiquidContainer.java @@ -56,7 +56,7 @@ public class TriggerLiquidContainer extends BCTrigger { } @Override - public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { if (tile instanceof ITankContainer) { ITankContainer container = (ITankContainer) tile; diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 556df3fe..50db805c 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -35,7 +35,7 @@ public class TriggerMachine extends BCTrigger { } @Override - public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { if (tile instanceof IMachine) { IMachine machine = (IMachine) tile; diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index 982e2c08..a5f7de06 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -68,7 +68,7 @@ public class TriggerPipeContents extends BCTrigger implements ITriggerPipe { } @Override - public boolean isTriggerActive(Pipe pipe, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, Pipe pipe, ITriggerParameter parameter) { if (pipe.transport instanceof PipeTransportItems) { PipeTransportItems transportItems = (PipeTransportItems) pipe.transport; diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java index d8187e7b..09d3c76f 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -66,7 +66,7 @@ public class TriggerPipeSignal extends BCTrigger implements ITriggerPipe { } @Override - public boolean isTriggerActive(Pipe pipe, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, Pipe pipe, ITriggerParameter parameter) { if (active) return pipe.signalStrength[color.ordinal()] > 0; else diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java index 897f502a..20c61462 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -37,7 +37,7 @@ public class TriggerRedstoneInput extends BCTrigger implements ITriggerPipe { } @Override - public boolean isTriggerActive(Pipe pipe, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, Pipe pipe, ITriggerParameter parameter) { if (active) return pipe.worldObj.isBlockIndirectlyGettingPowered(pipe.xCoord, pipe.yCoord, pipe.zCoord); else From e9c0d29032cdccf2b938271b6828f94ba43e17f8 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 23 Mar 2013 02:31:14 -0700 Subject: [PATCH 41/93] More API Pruning --- common/buildcraft/api/core/BuildCraftAPI.java | 27 ------------------ .../api/transport/FacadeManager.java | 5 ++++ .../api/transport/IExtractionHandler.java | 6 ++-- .../buildcraft/api/transport/PipeManager.java | 28 ++++++++----------- 4 files changed, 20 insertions(+), 46 deletions(-) diff --git a/common/buildcraft/api/core/BuildCraftAPI.java b/common/buildcraft/api/core/BuildCraftAPI.java index 5fe928bf..46a77c21 100644 --- a/common/buildcraft/api/core/BuildCraftAPI.java +++ b/common/buildcraft/api/core/BuildCraftAPI.java @@ -14,35 +14,8 @@ import net.minecraft.world.World; public class BuildCraftAPI { - @Deprecated - // To be removed, see LiquidContainerRegistry - public static final int BUCKET_VOLUME = 1000; public static final int LAST_ORIGINAL_BLOCK = 122; public static final int LAST_ORIGINAL_ITEM = 126; public static final boolean[] softBlocks = new boolean[Block.blocksList.length]; - - @Deprecated - // To be removed - public static boolean softBlock(int blockId) { - return blockId == 0 || softBlocks[blockId] || Block.blocksList[blockId] == null; - } - - @Deprecated - // To be removed - public static boolean unbreakableBlock(int blockId) { - return blockId == Block.bedrock.blockID || blockId == Block.lavaStill.blockID || blockId == Block.lavaMoving.blockID; - } - - @Deprecated - // To be removed - public static void breakBlock(World world, int x, int y, int z) { - int blockId = world.getBlockId(x, y, z); - - if (blockId != 0) { - Block.blocksList[blockId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); - } - - world.setBlock(x, y, z, 0); - } } diff --git a/common/buildcraft/api/transport/FacadeManager.java b/common/buildcraft/api/transport/FacadeManager.java index d27574fe..d0421b90 100644 --- a/common/buildcraft/api/transport/FacadeManager.java +++ b/common/buildcraft/api/transport/FacadeManager.java @@ -4,6 +4,11 @@ import java.lang.reflect.Method; import net.minecraft.item.ItemStack; +/** + * You can use this if you wish, but FML InterModComms are recommended. + * + * SYNTAX: add-facade:id@meta + */ public class FacadeManager { private static Method addFacade; diff --git a/common/buildcraft/api/transport/IExtractionHandler.java b/common/buildcraft/api/transport/IExtractionHandler.java index 7301ec94..863cc312 100644 --- a/common/buildcraft/api/transport/IExtractionHandler.java +++ b/common/buildcraft/api/transport/IExtractionHandler.java @@ -9,11 +9,13 @@ public interface IExtractionHandler { /** * Can this pipe extract items from the block located at these coordinates? + * param extractor can be null */ - boolean canExtractItems(IPipe pipe, World world, int i, int j, int k); + boolean canExtractItems(Object extractor, World world, int i, int j, int k); /** * Can this pipe extract liquids from the block located at these coordinates? + * param extractor can be null */ - boolean canExtractLiquids(IPipe pipe, World world, int i, int j, int k); + boolean canExtractLiquids(Object extractor, World world, int i, int j, int k); } diff --git a/common/buildcraft/api/transport/PipeManager.java b/common/buildcraft/api/transport/PipeManager.java index 47fc60ec..bccde42c 100644 --- a/common/buildcraft/api/transport/PipeManager.java +++ b/common/buildcraft/api/transport/PipeManager.java @@ -10,37 +10,31 @@ import cpw.mods.fml.relauncher.Side; public abstract class PipeManager { - @Deprecated - private static TreeMap allServerEntities = new TreeMap(); - @Deprecated - private static TreeMap allClientEntities = new TreeMap(); - public static List extractionHandlers = new ArrayList(); public static void registerExtractionHandler(IExtractionHandler handler) { extractionHandlers.add(handler); } - public static boolean canExtractItems(IPipe pipe, World world, int i, int j, int k) { + /** + * param extractor can be null + */ + public static boolean canExtractItems(Object extractor, World world, int i, int j, int k) { for (IExtractionHandler handler : extractionHandlers) - if (!handler.canExtractItems(pipe, world, i, j, k)) + if (!handler.canExtractItems(extractor, world, i, j, k)) return false; return true; } - - public static boolean canExtractLiquids(IPipe pipe, World world, int i, int j, int k) { + + /** + * param extractor can be null + */ + public static boolean canExtractLiquids(Object extractor, World world, int i, int j, int k) { for (IExtractionHandler handler : extractionHandlers) - if (!handler.canExtractLiquids(pipe, world, i, j, k)) + if (!handler.canExtractLiquids(extractor, world, i, j, k)) return false; return true; } - - @Deprecated - public static TreeMap getAllEntities() { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - return allClientEntities; - return allServerEntities; - } } From e35e0f22403759a7a00a8dbd96eed0cfc8301cba Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 23 Mar 2013 18:06:10 +0100 Subject: [PATCH 42/93] A custom BC built from source at an arbitrary time is versionless. Versions are decided on release. --- build.xml | 2 +- common/buildcraft/core/Version.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 5a8807b3..15b69dda 100644 --- a/build.xml +++ b/build.xml @@ -19,7 +19,7 @@ - + diff --git a/common/buildcraft/core/Version.java b/common/buildcraft/core/Version.java index 2564f82f..b6110953 100644 --- a/common/buildcraft/core/Version.java +++ b/common/buildcraft/core/Version.java @@ -63,6 +63,8 @@ public class Version implements Runnable { public static void versionCheck() { try { + if ("0.0.0".equals(VERSION)) return; + String location = REMOTE_VERSION_FILE; HttpURLConnection conn = null; while (location != null && !location.isEmpty()) { From a5d5d1a4360671bc0d5c026c9b48e68cf7335f03 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 23 Mar 2013 11:00:31 -0700 Subject: [PATCH 43/93] Fixed blueprint softblock error --- common/buildcraft/core/blueprints/BptBuilderTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index a2b28244..c8c07ea5 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -123,7 +123,7 @@ public class BptBuilderTemplate extends BptBuilderBase { BptSlot slot = list.getFirst(); // Note from CJ: I have no idea what this code is supposed to do, so I'm not touching it. - if (BuildCraftAPI.softBlock(slot.blockId) == BuildCraftAPI.softBlock(world.getBlockId(slot.x, slot.y, slot.z))) { + if (slot.blockId == world.getBlockId(slot.x, slot.y, slot.z)) { list.removeFirst(); } else if (slot.mode == Mode.ClearIfInvalid) { result = slot; From 05f8b556c414815e5025b8adb76eccdf97cf8e2f Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 23 Mar 2013 11:34:10 -0700 Subject: [PATCH 44/93] More API fixes --- common/buildcraft/BuildCraftTransport.java | 4 ++-- common/buildcraft/api/gates/ITrigger.java | 1 + common/buildcraft/core/triggers/BCTrigger.java | 3 ++- common/buildcraft/core/triggers/TriggerMachine.java | 1 + common/buildcraft/energy/TriggerEngineHeat.java | 3 ++- common/buildcraft/transport/triggers/TriggerPipeContents.java | 2 +- common/buildcraft/transport/triggers/TriggerPipeSignal.java | 2 +- .../buildcraft/transport/triggers/TriggerRedstoneInput.java | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index c30f92d3..881d269a 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -186,12 +186,12 @@ public class BuildCraftTransport { } @Override - public boolean canExtractItems(IPipe pipe, World world, int i, int j, int k) { + public boolean canExtractItems(Object extractor, World world, int i, int j, int k) { return testStrings(items, world, i, j, k); } @Override - public boolean canExtractLiquids(IPipe pipe, World world, int i, int j, int k) { + public boolean canExtractLiquids(Object extractor, World world, int i, int j, int k) { return testStrings(liquids, world, i, j, k); } diff --git a/common/buildcraft/api/gates/ITrigger.java b/common/buildcraft/api/gates/ITrigger.java index 80357c7c..a8f5f5e8 100644 --- a/common/buildcraft/api/gates/ITrigger.java +++ b/common/buildcraft/api/gates/ITrigger.java @@ -5,6 +5,7 @@ import net.minecraft.util.Icon; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public interface ITrigger { diff --git a/common/buildcraft/core/triggers/BCTrigger.java b/common/buildcraft/core/triggers/BCTrigger.java index 8aff1721..80d2ee93 100644 --- a/common/buildcraft/core/triggers/BCTrigger.java +++ b/common/buildcraft/core/triggers/BCTrigger.java @@ -19,6 +19,7 @@ import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.TriggerParameter; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; /** * This class has to be implemented to create new triggers kinds to BuildCraft gates. There is an instance per kind, which will get called wherever the trigger @@ -59,7 +60,7 @@ public abstract class BCTrigger implements ITrigger { } @Override - public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { return false; } diff --git a/common/buildcraft/core/triggers/TriggerMachine.java b/common/buildcraft/core/triggers/TriggerMachine.java index 50db805c..1c457347 100644 --- a/common/buildcraft/core/triggers/TriggerMachine.java +++ b/common/buildcraft/core/triggers/TriggerMachine.java @@ -15,6 +15,7 @@ import buildcraft.api.gates.ITriggerParameter; import buildcraft.core.IMachine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class TriggerMachine extends BCTrigger { diff --git a/common/buildcraft/energy/TriggerEngineHeat.java b/common/buildcraft/energy/TriggerEngineHeat.java index 57b466a3..4cdcbf77 100644 --- a/common/buildcraft/energy/TriggerEngineHeat.java +++ b/common/buildcraft/energy/TriggerEngineHeat.java @@ -16,6 +16,7 @@ import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCTrigger; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.ForgeDirection; public class TriggerEngineHeat extends BCTrigger { @@ -42,7 +43,7 @@ public class TriggerEngineHeat extends BCTrigger { } @Override - public boolean isTriggerActive(TileEntity tile, ITriggerParameter parameter) { + public boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter) { if (tile instanceof TileEngine) { Engine engine = ((TileEngine) tile).engine; diff --git a/common/buildcraft/transport/triggers/TriggerPipeContents.java b/common/buildcraft/transport/triggers/TriggerPipeContents.java index a5f7de06..982e2c08 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeContents.java +++ b/common/buildcraft/transport/triggers/TriggerPipeContents.java @@ -68,7 +68,7 @@ public class TriggerPipeContents extends BCTrigger implements ITriggerPipe { } @Override - public boolean isTriggerActive(ForgeDirection side, Pipe pipe, ITriggerParameter parameter) { + public boolean isTriggerActive(Pipe pipe, ITriggerParameter parameter) { if (pipe.transport instanceof PipeTransportItems) { PipeTransportItems transportItems = (PipeTransportItems) pipe.transport; diff --git a/common/buildcraft/transport/triggers/TriggerPipeSignal.java b/common/buildcraft/transport/triggers/TriggerPipeSignal.java index 09d3c76f..d8187e7b 100644 --- a/common/buildcraft/transport/triggers/TriggerPipeSignal.java +++ b/common/buildcraft/transport/triggers/TriggerPipeSignal.java @@ -66,7 +66,7 @@ public class TriggerPipeSignal extends BCTrigger implements ITriggerPipe { } @Override - public boolean isTriggerActive(ForgeDirection side, Pipe pipe, ITriggerParameter parameter) { + public boolean isTriggerActive(Pipe pipe, ITriggerParameter parameter) { if (active) return pipe.signalStrength[color.ordinal()] > 0; else diff --git a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java index 20c61462..897f502a 100644 --- a/common/buildcraft/transport/triggers/TriggerRedstoneInput.java +++ b/common/buildcraft/transport/triggers/TriggerRedstoneInput.java @@ -37,7 +37,7 @@ public class TriggerRedstoneInput extends BCTrigger implements ITriggerPipe { } @Override - public boolean isTriggerActive(ForgeDirection side, Pipe pipe, ITriggerParameter parameter) { + public boolean isTriggerActive(Pipe pipe, ITriggerParameter parameter) { if (active) return pipe.worldObj.isBlockIndirectlyGettingPowered(pipe.xCoord, pipe.yCoord, pipe.zCoord); else From 86d69f4078881678f89dc314f48e4843863abdbe Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 23 Mar 2013 23:09:10 +0100 Subject: [PATCH 45/93] Extracted method dropFacadeItem to avoid code duplication --- common/buildcraft/transport/TileGenericPipe.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index cd265c06..e0056da7 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -566,10 +566,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank return false; if (hasFacade(direction)) { - Utils.dropItems( - worldObj, - new ItemStack(BuildCraftTransport.facadeItem, 1, - ItemFacade.encode(this.facadeBlocks[direction.ordinal()], this.facadeMeta[direction.ordinal()])), this.xCoord, this.yCoord, this.zCoord); + dropFacadeItem(direction); } this.facadeBlocks[direction.ordinal()] = blockid; @@ -584,16 +581,17 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank return renderState.facadeMatrix.isConnected(direction); return (this.facadeBlocks[direction.ordinal()] != 0); } + + private void dropFacadeItem(ForgeDirection direction){ + Utils.dropItems(worldObj, new ItemStack(BuildCraftTransport.facadeItem, 1, ItemFacade.encode(this.facadeBlocks[direction.ordinal()], this.facadeMeta[direction.ordinal()])), this.xCoord, this.yCoord, this.zCoord); + } public void dropFacade(ForgeDirection direction) { if (this.worldObj.isRemote) return; if (!hasFacade(direction)) return; - Utils.dropItems( - worldObj, - new ItemStack(BuildCraftTransport.facadeItem, 1, - ItemFacade.encode(this.facadeBlocks[direction.ordinal()], this.facadeMeta[direction.ordinal()])), this.xCoord, this.yCoord, this.zCoord); + dropFacadeItem(direction); this.facadeBlocks[direction.ordinal()] = 0; this.facadeMeta[direction.ordinal()] = 0; worldObj.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, worldObj.getBlockId(this.xCoord, this.yCoord, this.zCoord)); From 005d0bc4e1e3fb333f2857201e71f871e695e7a3 Mon Sep 17 00:00:00 2001 From: Krapht Date: Mon, 25 Mar 2013 17:56:14 +0100 Subject: [PATCH 46/93] Fix marker's rendering --- .../core/render/RenderingMarkers.java | 134 ++++++++---------- 1 file changed, 63 insertions(+), 71 deletions(-) diff --git a/common/buildcraft/core/render/RenderingMarkers.java b/common/buildcraft/core/render/RenderingMarkers.java index 79757fcc..a1be4f77 100644 --- a/common/buildcraft/core/render/RenderingMarkers.java +++ b/common/buildcraft/core/render/RenderingMarkers.java @@ -120,102 +120,94 @@ public class RenderingMarkers implements ISimpleBlockRenderingHandler { Icon i = block.getBlockTexture(iblockaccess, xCoord, yCoord, zCoord, 1); int m = meta; - int j = i.getOriginX(); - int k = i.getOriginY(); - float f = j / 256F; - float f1 = (j + 15.99F) / 256F; - float f2 = k / 256F; - float f3 = (k + 15.99F) / 256F; - double d5 = f + 0.02734375D; - double d6 = f2 + 0.0234375D; - double d7 = f + 0.02734375D; - double d8 = f2 + 0.0234375D; x += 0.5D; z += 0.5D; + + double minU = (double)i.getInterpolatedU(7); + double minV = (double)i.getInterpolatedV(7); + double maxU = (double)i.getInterpolatedU(9); + double maxV = (double)i.getInterpolatedV(9); + tessellator.setBrightness(block.getMixedBrightnessForBlock(iblockaccess, xCoord, yCoord, zCoord)); - double s = 0.0625D; - + double s = 1F / 16F; + if (meta == 5) { - tessellator.addVertexWithUV(x - s, y + 0.5 + s, z - s, d5, d6); - tessellator.addVertexWithUV(x - s, y + 0.5 + s, z + s, d5, d8); - tessellator.addVertexWithUV(x + s, y + 0.5 + s, z + s, d7, d8); - tessellator.addVertexWithUV(x + s, y + 0.5 + s, z - s, d7, d6); + tessellator.addVertexWithUV(x - s, y + 0.5 + s, z - s, minU, minV); + tessellator.addVertexWithUV(x - s, y + 0.5 + s, z + s, minU, maxV); + tessellator.addVertexWithUV(x + s, y + 0.5 + s, z + s, maxU, maxV); + tessellator.addVertexWithUV(x + s, y + 0.5 + s, z - s, maxU, minV); } else if (meta == 0) { - tessellator.addVertexWithUV(x + s, y + 0.5 - s, z - s, d7, d6); - tessellator.addVertexWithUV(x + s, y + 0.5 - s, z + s, d7, d8); - tessellator.addVertexWithUV(x - s, y + 0.5 - s, z + s, d5, d8); - tessellator.addVertexWithUV(x - s, y + 0.5 - s, z - s, d5, d6); + tessellator.addVertexWithUV(x + s, y + 0.5 - s, z - s, maxU, minV); + tessellator.addVertexWithUV(x + s, y + 0.5 - s, z + s, maxU, maxV); + tessellator.addVertexWithUV(x - s, y + 0.5 - s, z + s, minU, maxV); + tessellator.addVertexWithUV(x - s, y + 0.5 - s, z - s, minU, minV); } else if (meta == 2) { - tessellator.addVertexWithUV(x - s, y + 0.5 - s, z - s, d5, d6); - tessellator.addVertexWithUV(x - s, y + 0.5 - s, z + s, d5, d8); - tessellator.addVertexWithUV(x - s, y + 0.5 + s, z + s, d7, d8); - tessellator.addVertexWithUV(x - s, y + 0.5 + s, z - s, d7, d6); + tessellator.addVertexWithUV(x - s, y + 0.5 - s, z - s, minU, minV); + tessellator.addVertexWithUV(x - s, y + 0.5 - s, z + s, minU, maxV); + tessellator.addVertexWithUV(x - s, y + 0.5 + s, z + s, maxU, maxV); + tessellator.addVertexWithUV(x - s, y + 0.5 + s, z - s, maxU, minV); } else if (meta == 1) { - tessellator.addVertexWithUV(x + s, y + 0.5 + s, z - s, d7, d6); - tessellator.addVertexWithUV(x + s, y + 0.5 + s, z + s, d7, d8); - tessellator.addVertexWithUV(x + s, y + 0.5 - s, z + s, d5, d8); - tessellator.addVertexWithUV(x + s, y + 0.5 - s, z - s, d5, d6); + tessellator.addVertexWithUV(x + s, y + 0.5 + s, z - s, maxU, minV); + tessellator.addVertexWithUV(x + s, y + 0.5 + s, z + s, maxU, maxV); + tessellator.addVertexWithUV(x + s, y + 0.5 - s, z + s, minU, maxV); + tessellator.addVertexWithUV(x + s, y + 0.5 - s, z - s, minU, minV); } else if (meta == 3) { - tessellator.addVertexWithUV(x - s, y + 0.5 - s, z + s, d5, d6); - tessellator.addVertexWithUV(x + s, y + 0.5 - s, z + s, d5, d8); - tessellator.addVertexWithUV(x + s, y + 0.5 + s, z + s, d7, d8); - tessellator.addVertexWithUV(x - s, y + 0.5 + s, z + s, d7, d6); + tessellator.addVertexWithUV(x - s, y + 0.5 - s, z + s, minU, minV); + tessellator.addVertexWithUV(x + s, y + 0.5 - s, z + s, minU, maxV); + tessellator.addVertexWithUV(x + s, y + 0.5 + s, z + s, maxU, maxV); + tessellator.addVertexWithUV(x - s, y + 0.5 + s, z + s, maxU, minV); } else if (meta == 4) { - tessellator.addVertexWithUV(x - s, y + 0.5 + s, z - s, d7, d6); - tessellator.addVertexWithUV(x + s, y + 0.5 + s, z - s, d7, d8); - tessellator.addVertexWithUV(x + s, y + 0.5 - s, z - s, d5, d8); - tessellator.addVertexWithUV(x - s, y + 0.5 - s, z - s, d5, d6); + tessellator.addVertexWithUV(x - s, y + 0.5 + s, z - s, maxU, minV); + tessellator.addVertexWithUV(x + s, y + 0.5 + s, z - s, maxU, maxV); + tessellator.addVertexWithUV(x + s, y + 0.5 - s, z - s, minU, maxV); + tessellator.addVertexWithUV(x - s, y + 0.5 - s, z - s, minU, minV); } - + i = block.getBlockTexture(iblockaccess, xCoord, yCoord, zCoord, 0); - j = i.getOriginX(); - k = i.getOriginY(); - f = j / 256F; - f1 = (j + 15.99F) / 256F; - f2 = k / 256F; - f3 = (k + 15.99F) / 256F; - d5 = f + 0.02734375D; - d6 = f2 + 0.0234375D; - d7 = f + 0.02734375D; - d8 = f2 + 0.0234375D; + + + minU = i.getMinU(); + maxU = i.getMaxU(); + minV = i.getMinV(); + maxV = i.getMaxV(); if (meta == 5 || meta == 4 || meta == 3 || meta == 0) { - tessellator.addVertexWithUV(x + frontX[m][0][0], y + frontX[m][1][0], z + frontX[m][2][0], f, f2); - tessellator.addVertexWithUV(x + frontX[m][0][1], y + frontX[m][1][1], z + frontX[m][2][1], f, f3); - tessellator.addVertexWithUV(x + frontX[m][0][2], y + frontX[m][1][2], z + frontX[m][2][2], f1, f3); - tessellator.addVertexWithUV(x + frontX[m][0][3], y + frontX[m][1][3], z + frontX[m][2][3], f1, f2); + tessellator.addVertexWithUV(x + frontX[m][0][0], y + frontX[m][1][0], z + frontX[m][2][0], minU, minV); + tessellator.addVertexWithUV(x + frontX[m][0][1], y + frontX[m][1][1], z + frontX[m][2][1], minU, maxV); + tessellator.addVertexWithUV(x + frontX[m][0][2], y + frontX[m][1][2], z + frontX[m][2][2], maxU, maxV); + tessellator.addVertexWithUV(x + frontX[m][0][3], y + frontX[m][1][3], z + frontX[m][2][3], maxU, minV); - tessellator.addVertexWithUV(x - frontX[m][0][3], y + frontX[m][1][3], z + frontX[m][2][3], f1, f2); - tessellator.addVertexWithUV(x - frontX[m][0][2], y + frontX[m][1][2], z + frontX[m][2][2], f1, f3); - tessellator.addVertexWithUV(x - frontX[m][0][1], y + frontX[m][1][1], z + frontX[m][2][1], f, f3); - tessellator.addVertexWithUV(x - frontX[m][0][0], y + frontX[m][1][0], z + frontX[m][2][0], f, f2); + tessellator.addVertexWithUV(x - frontX[m][0][3], y + frontX[m][1][3], z + frontX[m][2][3], maxU, minV); + tessellator.addVertexWithUV(x - frontX[m][0][2], y + frontX[m][1][2], z + frontX[m][2][2], maxU, maxV); + tessellator.addVertexWithUV(x - frontX[m][0][1], y + frontX[m][1][1], z + frontX[m][2][1], minU, maxV); + tessellator.addVertexWithUV(x - frontX[m][0][0], y + frontX[m][1][0], z + frontX[m][2][0], minU, minV); } if (meta == 5 || meta == 2 || meta == 1 || meta == 0) { - tessellator.addVertexWithUV(x + frontZ[m][0][0], y + frontZ[m][1][0], z + frontZ[m][2][0], f, f2); - tessellator.addVertexWithUV(x + frontZ[m][0][1], y + frontZ[m][1][1], z + frontZ[m][2][1], f, f3); - tessellator.addVertexWithUV(x + frontZ[m][0][2], y + frontZ[m][1][2], z + frontZ[m][2][2], f1, f3); - tessellator.addVertexWithUV(x + frontZ[m][0][3], y + frontZ[m][1][3], z + frontZ[m][2][3], f1, f2); + tessellator.addVertexWithUV(x + frontZ[m][0][0], y + frontZ[m][1][0], z + frontZ[m][2][0], minU, minV); + tessellator.addVertexWithUV(x + frontZ[m][0][1], y + frontZ[m][1][1], z + frontZ[m][2][1], minU, maxV); + tessellator.addVertexWithUV(x + frontZ[m][0][2], y + frontZ[m][1][2], z + frontZ[m][2][2], maxU, maxV); + tessellator.addVertexWithUV(x + frontZ[m][0][3], y + frontZ[m][1][3], z + frontZ[m][2][3], maxU, minV); - tessellator.addVertexWithUV(x + frontZ[m][0][3], y + frontZ[m][1][3], z - frontZ[m][2][3], f1, f2); - tessellator.addVertexWithUV(x + frontZ[m][0][2], y + frontZ[m][1][2], z - frontZ[m][2][2], f1, f3); - tessellator.addVertexWithUV(x + frontZ[m][0][1], y + frontZ[m][1][1], z - frontZ[m][2][1], f, f3); - tessellator.addVertexWithUV(x + frontZ[m][0][0], y + frontZ[m][1][0], z - frontZ[m][2][0], f, f2); + tessellator.addVertexWithUV(x + frontZ[m][0][3], y + frontZ[m][1][3], z - frontZ[m][2][3], maxU, minV); + tessellator.addVertexWithUV(x + frontZ[m][0][2], y + frontZ[m][1][2], z - frontZ[m][2][2], maxU, maxV); + tessellator.addVertexWithUV(x + frontZ[m][0][1], y + frontZ[m][1][1], z - frontZ[m][2][1], minU, maxV); + tessellator.addVertexWithUV(x + frontZ[m][0][0], y + frontZ[m][1][0], z - frontZ[m][2][0], minU, minV); } if (meta == 4 || meta == 3 || meta == 2 || meta == 1) { - tessellator.addVertexWithUV(x + frontY[m][0][0], y + 0.5 + frontY[m][1][0], z + frontY[m][2][0], f, f2); - tessellator.addVertexWithUV(x + frontY[m][0][1], y + 0.5 + frontY[m][1][1], z + frontY[m][2][1], f, f3); - tessellator.addVertexWithUV(x + frontY[m][0][2], y + 0.5 + frontY[m][1][2], z + frontY[m][2][2], f1, f3); - tessellator.addVertexWithUV(x + frontY[m][0][3], y + 0.5 + frontY[m][1][3], z + frontY[m][2][3], f1, f2); + tessellator.addVertexWithUV(x + frontY[m][0][0], y + 0.5 + frontY[m][1][0], z + frontY[m][2][0], minU, minV); + tessellator.addVertexWithUV(x + frontY[m][0][1], y + 0.5 + frontY[m][1][1], z + frontY[m][2][1], minU, maxV); + tessellator.addVertexWithUV(x + frontY[m][0][2], y + 0.5 + frontY[m][1][2], z + frontY[m][2][2], maxU, maxV); + tessellator.addVertexWithUV(x + frontY[m][0][3], y + 0.5 + frontY[m][1][3], z + frontY[m][2][3], maxU, minV); - tessellator.addVertexWithUV(x + frontY[m][0][3], y + 0.5 - frontY[m][1][3], z + frontY[m][2][3], f1, f2); - tessellator.addVertexWithUV(x + frontY[m][0][2], y + 0.5 - frontY[m][1][2], z + frontY[m][2][2], f1, f3); - tessellator.addVertexWithUV(x + frontY[m][0][1], y + 0.5 - frontY[m][1][1], z + frontY[m][2][1], f, f3); - tessellator.addVertexWithUV(x + frontY[m][0][0], y + 0.5 - frontY[m][1][0], z + frontY[m][2][0], f, f2); + tessellator.addVertexWithUV(x + frontY[m][0][3], y + 0.5 - frontY[m][1][3], z + frontY[m][2][3], maxU, minV); + tessellator.addVertexWithUV(x + frontY[m][0][2], y + 0.5 - frontY[m][1][2], z + frontY[m][2][2], maxU, maxV); + tessellator.addVertexWithUV(x + frontY[m][0][1], y + 0.5 - frontY[m][1][1], z + frontY[m][2][1], minU, maxV); + tessellator.addVertexWithUV(x + frontY[m][0][0], y + 0.5 - frontY[m][1][0], z + frontY[m][2][0], minU, minV); } } From 84754e1e79359fd1bc895d012eb9eba2c2a0c70c Mon Sep 17 00:00:00 2001 From: Krapht Date: Tue, 26 Mar 2013 23:04:35 +0100 Subject: [PATCH 47/93] lowercased texture name fixes #700 --- ...Cobblestone.png => pipeStructureCobblestone.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/blocks/{PipeStructureCobblestone.png => pipeStructureCobblestone.png} (100%) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/PipeStructureCobblestone.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeStructureCobblestone.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/PipeStructureCobblestone.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeStructureCobblestone.png From 07a69b4e87c21e763445403e09ed709b7c78e167 Mon Sep 17 00:00:00 2001 From: Krapht Date: Tue, 26 Mar 2013 23:54:45 +0100 Subject: [PATCH 48/93] Redid some textures that was dark/nontrasparent --- .../textures/blocks/pipeAllIron_solid.png | Bin 418 -> 207 bytes .../textures/blocks/pipeItemsCobblestone.png | Bin 407 -> 198 bytes .../textures/blocks/pipeItemsIron_standard.png | Bin 407 -> 199 bytes .../textures/blocks/pipeItemsStone.png | Bin 408 -> 198 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllIron_solid.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeAllIron_solid.png index 75a11c5848c6827e97380a51947c5a7d9e84cdd1..019e99972d08dcad648aa54cbcefd527dd568885 100644 GIT binary patch delta 156 zcmV;N0Av561J41F83+Ub006c6H|mjiCVvNXNliru-2)mHG&2SvC0PIf0ANW(K~yNu zg^|k8?^du`q2OY00{s| KMNUMnLSTXhyFkGJ literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0Q%R6t zFatx`UmxSEcs*;PsCF&HaZ&KH>Yoo!9{gIea;M&Bu`J#Osd>&u_nb^dJvYZCjn z-&ddg+QJ@S|E~TmL-oIS#^RsFia=9UOI#yLQW8s2t&)pUffR$0fuXUkfuXLEL5QJ| zm4T6!36N`QWnl0&CNTmskwxlmbZx=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q8W?;jS_o9d;OXk;vd$@?2>_QS Bdv5>$ diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsCobblestone.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsCobblestone.png index a1754c2938aa68491a6c5e6491904f15d80d793a..2333e35fe399383be2aa1d83cb49e6131562a0a2 100644 GIT binary patch delta 146 zcmV;D0B!%51I7W683+Ub006c6H|mjiCVvNXNliru-2)mHD-M$rXVw4!09Q#wK~yNu zjZrZU03i&*CjI||Z>WQMO0`uMBM^`Xbf~T8xB&u!+Et<807*qoM6N<$g2yvE A;{X5v literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0Q%R6t zFatx`iwGhVh2y4!mvzN=ktwgY(l$ q$`gxH83GbB^GfvmTtgJfjP*?Q3=Isv6fFd*V(@hJb6Mw<&;$T=Vs|qD diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsIron_standard.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeItemsIron_standard.png index 8b586b7bc0466c5fc17bc7f4e07a6c336cf76fff..455153b69157590a7f5127328bdef1460225dc3d 100644 GIT binary patch delta 148 zcmV;F0Bir31IGc783+Ub006c6H|mjiCVvNXNliru-2)mHF)ANDdE5X109Z*xK~yNu zjZw)F03i&*v|<0HrH=UUB%18}L9G^MB$vtXl7X_@QmC=fJ@OsC z44JIv_HzYsx1lo*n!002ovPDHLkU;%>h Cfjxi# literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0Q%R6t zFatx`L68k;nK`L>iMgp(B|rv)VZ2fJ$z9e!Nhy$IaDG}z pd16s2LqK9?UWuNcYluRbv7V`(p@G4dqJ=-=L+I>Lt`WkZ^f@OxndnHad=?xqp!bN0s40;rUCudasU7T07*qoM6N<$g4%mJ A_W%F@ literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UASkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e`PGJ=6YykO3*KpUV0Q%R6t zFatx`bP0l+XkK#LRb; From 9baae232e3ab2bc76600f83409af672def3c55a2 Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Wed, 27 Mar 2013 23:48:56 +1300 Subject: [PATCH 49/93] Update BlockOilStill.java Fix quick bug that Flow86 pointed out. --- common/buildcraft/energy/BlockOilStill.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index 5245e302..e7c1f03b 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -50,5 +50,17 @@ public class BlockOilStill extends BlockStationary implements ILiquid { public boolean isBlockReplaceable(World world, int i, int j, int k) { return true; } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister){ + this.field_94425_a = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { + return par1 != 0 && par1 != 1 ? this.field_94425_a[1] : this.field_94425_a[0]; + } } From 6e07805fce77dce869ea1879dc47867297af38d4 Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Wed, 27 Mar 2013 23:54:53 +1300 Subject: [PATCH 50/93] Update BlockOilStill.java I forgot something --- common/buildcraft/energy/BlockOilStill.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index e7c1f03b..7d3c6a45 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -19,6 +19,8 @@ import buildcraft.core.DefaultProps; public class BlockOilStill extends BlockStationary implements ILiquid { + private Icon[] field_94425_a; + public BlockOilStill(int i, Material material) { super(i, material); From 38072c8aa7a9a69f30b5b2be7534f6ebc37875b4 Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Thu, 28 Mar 2013 00:00:06 +1300 Subject: [PATCH 51/93] Update BlockOilStill.java Missed an @SideOnly --- common/buildcraft/energy/BlockOilStill.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index 7d3c6a45..8543ea48 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -19,6 +19,7 @@ import buildcraft.core.DefaultProps; public class BlockOilStill extends BlockStationary implements ILiquid { + @SideOnly(Side.CLIENT) private Icon[] field_94425_a; public BlockOilStill(int i, Material material) { From 15430f4277bf85d10ba0411aa60e0ca896ca5f8f Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Thu, 28 Mar 2013 00:01:15 +1300 Subject: [PATCH 52/93] Update BlockOilFlowing.java Missed an @SideOnly --- common/buildcraft/energy/BlockOilFlowing.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index ce145e03..56bcdb41 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -30,6 +30,8 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { int numAdjacentSources = 0; boolean isOptimalFlowDirection[] = new boolean[4]; int flowCost[] = new int[4]; + + @SideOnly(Side.CLIENT) private Icon[] field_94425_a; public BlockOilFlowing(int i, Material material) { From bd91c3ad21a66977976c8ad93e9530fa7c499f9c Mon Sep 17 00:00:00 2001 From: Krapht Date: Wed, 27 Mar 2013 17:00:44 +0100 Subject: [PATCH 53/93] Mark Builder API as deprecated --- common/buildcraft/api/blueprints/BlueprintManager.java | 1 + common/buildcraft/api/blueprints/BptBlock.java | 2 ++ common/buildcraft/api/blueprints/BptBlockUtils.java | 1 + common/buildcraft/api/blueprints/BptSlotInfo.java | 2 ++ common/buildcraft/api/blueprints/IBptContext.java | 2 ++ common/buildcraft/api/blueprints/ItemSignature.java | 1 + common/buildcraft/api/bptblocks/BptBlockBed.java | 1 + common/buildcraft/api/bptblocks/BptBlockCustomStack.java | 1 + common/buildcraft/api/bptblocks/BptBlockDelegate.java | 1 + common/buildcraft/api/bptblocks/BptBlockDirt.java | 1 + common/buildcraft/api/bptblocks/BptBlockDoor.java | 1 + common/buildcraft/api/bptblocks/BptBlockIgnore.java | 1 + common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java | 1 + common/buildcraft/api/bptblocks/BptBlockInventory.java | 1 + common/buildcraft/api/bptblocks/BptBlockLever.java | 1 + common/buildcraft/api/bptblocks/BptBlockLiquid.java | 1 + common/buildcraft/api/bptblocks/BptBlockPiston.java | 1 + common/buildcraft/api/bptblocks/BptBlockPumpkin.java | 1 + common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java | 1 + common/buildcraft/api/bptblocks/BptBlockRotateInventory.java | 1 + common/buildcraft/api/bptblocks/BptBlockRotateMeta.java | 1 + common/buildcraft/api/bptblocks/BptBlockSign.java | 1 + common/buildcraft/api/bptblocks/BptBlockStairs.java | 1 + common/buildcraft/api/bptblocks/BptBlockWallSide.java | 1 + common/buildcraft/builders/BptBlockFiller.java | 1 + common/buildcraft/energy/BptBlockEngine.java | 1 + common/buildcraft/factory/BptBlockAutoWorkbench.java | 1 + common/buildcraft/factory/BptBlockFrame.java | 1 + common/buildcraft/factory/BptBlockRefinery.java | 1 + common/buildcraft/factory/BptBlockTank.java | 1 + common/buildcraft/transport/blueprints/BptBlockPipe.java | 1 + 31 files changed, 34 insertions(+) diff --git a/common/buildcraft/api/blueprints/BlueprintManager.java b/common/buildcraft/api/blueprints/BlueprintManager.java index bea845cc..9bab365b 100644 --- a/common/buildcraft/api/blueprints/BlueprintManager.java +++ b/common/buildcraft/api/blueprints/BlueprintManager.java @@ -5,6 +5,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import buildcraft.api.core.BuildCraftAPI; +@Deprecated public class BlueprintManager { public static BptBlock[] blockBptProps = new BptBlock[Block.blocksList.length]; diff --git a/common/buildcraft/api/blueprints/BptBlock.java b/common/buildcraft/api/blueprints/BptBlock.java index ada58389..3d160531 100644 --- a/common/buildcraft/api/blueprints/BptBlock.java +++ b/common/buildcraft/api/blueprints/BptBlock.java @@ -41,6 +41,8 @@ import buildcraft.api.core.BuildCraftAPI; * search through the block list, and upon matching signature, it will translate all blocks ids of the blueprint to the installation ones. If no such block id * is found, BuildCraft will assume that the block is not installed and will not load the blueprint. */ + +@Deprecated public class BptBlock { public final int blockId; diff --git a/common/buildcraft/api/blueprints/BptBlockUtils.java b/common/buildcraft/api/blueprints/BptBlockUtils.java index f80df6f9..a2d4ec19 100644 --- a/common/buildcraft/api/blueprints/BptBlockUtils.java +++ b/common/buildcraft/api/blueprints/BptBlockUtils.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +@Deprecated public class BptBlockUtils { public static void requestInventoryContents(BptSlotInfo slot, IBptContext context, LinkedList requirements) { diff --git a/common/buildcraft/api/blueprints/BptSlotInfo.java b/common/buildcraft/api/blueprints/BptSlotInfo.java index 494498cd..32d5962f 100644 --- a/common/buildcraft/api/blueprints/BptSlotInfo.java +++ b/common/buildcraft/api/blueprints/BptSlotInfo.java @@ -17,6 +17,8 @@ import net.minecraft.nbt.NBTTagCompound; /** * This class records a slot, either from a blueprint or from a block placed in the world. */ + +@Deprecated public class BptSlotInfo { public int blockId = 0; diff --git a/common/buildcraft/api/blueprints/IBptContext.java b/common/buildcraft/api/blueprints/IBptContext.java index abe6ffed..4b8c6715 100644 --- a/common/buildcraft/api/blueprints/IBptContext.java +++ b/common/buildcraft/api/blueprints/IBptContext.java @@ -17,6 +17,8 @@ import buildcraft.api.core.Position; /** * This interface provide contextual information when building or initializing blueprint slots. */ + +@Deprecated public interface IBptContext { /** diff --git a/common/buildcraft/api/blueprints/ItemSignature.java b/common/buildcraft/api/blueprints/ItemSignature.java index 6ff25b5b..d6bd0310 100644 --- a/common/buildcraft/api/blueprints/ItemSignature.java +++ b/common/buildcraft/api/blueprints/ItemSignature.java @@ -9,6 +9,7 @@ package buildcraft.api.blueprints; +@Deprecated public class ItemSignature { public String itemClassName; diff --git a/common/buildcraft/api/bptblocks/BptBlockBed.java b/common/buildcraft/api/bptblocks/BptBlockBed.java index 8a40b98d..904f1a9f 100644 --- a/common/buildcraft/api/bptblocks/BptBlockBed.java +++ b/common/buildcraft/api/bptblocks/BptBlockBed.java @@ -17,6 +17,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockBed extends BptBlock { public BptBlockBed(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockCustomStack.java b/common/buildcraft/api/bptblocks/BptBlockCustomStack.java index 35efa285..959b7eba 100644 --- a/common/buildcraft/api/bptblocks/BptBlockCustomStack.java +++ b/common/buildcraft/api/bptblocks/BptBlockCustomStack.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockCustomStack extends BptBlock { final ItemStack customStack; diff --git a/common/buildcraft/api/bptblocks/BptBlockDelegate.java b/common/buildcraft/api/bptblocks/BptBlockDelegate.java index 49f20343..c6b5ad33 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDelegate.java +++ b/common/buildcraft/api/bptblocks/BptBlockDelegate.java @@ -17,6 +17,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockDelegate extends BptBlock { final int delegateTo; diff --git a/common/buildcraft/api/bptblocks/BptBlockDirt.java b/common/buildcraft/api/bptblocks/BptBlockDirt.java index 35f32cdd..61643d64 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDirt.java +++ b/common/buildcraft/api/bptblocks/BptBlockDirt.java @@ -17,6 +17,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockDirt extends BptBlock { public BptBlockDirt(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockDoor.java b/common/buildcraft/api/bptblocks/BptBlockDoor.java index 242cef22..ffd0bbef 100644 --- a/common/buildcraft/api/bptblocks/BptBlockDoor.java +++ b/common/buildcraft/api/bptblocks/BptBlockDoor.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockDoor extends BptBlock { final ItemStack stack; diff --git a/common/buildcraft/api/bptblocks/BptBlockIgnore.java b/common/buildcraft/api/bptblocks/BptBlockIgnore.java index e501bfaf..dd58463d 100644 --- a/common/buildcraft/api/bptblocks/BptBlockIgnore.java +++ b/common/buildcraft/api/bptblocks/BptBlockIgnore.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockIgnore extends BptBlock { public BptBlockIgnore(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java b/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java index 8f00fd2f..0e490463 100644 --- a/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java +++ b/common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockIgnoreMeta extends BptBlock { public BptBlockIgnoreMeta(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockInventory.java b/common/buildcraft/api/bptblocks/BptBlockInventory.java index d2f30014..e4ebf709 100644 --- a/common/buildcraft/api/bptblocks/BptBlockInventory.java +++ b/common/buildcraft/api/bptblocks/BptBlockInventory.java @@ -5,6 +5,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockInventory extends BptBlock { public BptBlockInventory(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockLever.java b/common/buildcraft/api/bptblocks/BptBlockLever.java index c55f1959..0a1eab23 100644 --- a/common/buildcraft/api/bptblocks/BptBlockLever.java +++ b/common/buildcraft/api/bptblocks/BptBlockLever.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockLever extends BptBlockWallSide { public BptBlockLever(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockLiquid.java b/common/buildcraft/api/bptblocks/BptBlockLiquid.java index e94ee150..49172957 100644 --- a/common/buildcraft/api/bptblocks/BptBlockLiquid.java +++ b/common/buildcraft/api/bptblocks/BptBlockLiquid.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockLiquid extends BptBlock { private final ItemStack bucketStack; diff --git a/common/buildcraft/api/bptblocks/BptBlockPiston.java b/common/buildcraft/api/bptblocks/BptBlockPiston.java index 391f42d3..b12693bd 100644 --- a/common/buildcraft/api/bptblocks/BptBlockPiston.java +++ b/common/buildcraft/api/bptblocks/BptBlockPiston.java @@ -12,6 +12,7 @@ package buildcraft.api.bptblocks; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockPiston extends BptBlockRotateMeta { public BptBlockPiston(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockPumpkin.java b/common/buildcraft/api/bptblocks/BptBlockPumpkin.java index af3a2135..43473f98 100644 --- a/common/buildcraft/api/bptblocks/BptBlockPumpkin.java +++ b/common/buildcraft/api/bptblocks/BptBlockPumpkin.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockPumpkin extends BptBlock { public BptBlockPumpkin(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java b/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java index 84549ba9..67ca97c3 100644 --- a/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java +++ b/common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java @@ -17,6 +17,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockRedstoneRepeater extends BptBlock { public BptBlockRedstoneRepeater(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java b/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java index fe830586..319fcf7e 100644 --- a/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java +++ b/common/buildcraft/api/bptblocks/BptBlockRotateInventory.java @@ -4,6 +4,7 @@ import net.minecraft.inventory.IInventory; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockRotateInventory extends BptBlockRotateMeta { public BptBlockRotateInventory(int blockId, int[] rotations, boolean rotateForward) { diff --git a/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java b/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java index bf5ffa2b..eb846df5 100644 --- a/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java +++ b/common/buildcraft/api/bptblocks/BptBlockRotateMeta.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockRotateMeta extends BptBlock { int[] rot; diff --git a/common/buildcraft/api/bptblocks/BptBlockSign.java b/common/buildcraft/api/bptblocks/BptBlockSign.java index a19fd745..84a3996a 100644 --- a/common/buildcraft/api/bptblocks/BptBlockSign.java +++ b/common/buildcraft/api/bptblocks/BptBlockSign.java @@ -19,6 +19,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockSign extends BptBlock { boolean isWall; diff --git a/common/buildcraft/api/bptblocks/BptBlockStairs.java b/common/buildcraft/api/bptblocks/BptBlockStairs.java index 2e4b2b8b..8ade4a4d 100644 --- a/common/buildcraft/api/bptblocks/BptBlockStairs.java +++ b/common/buildcraft/api/bptblocks/BptBlockStairs.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockStairs extends BptBlock { public BptBlockStairs(int blockId) { diff --git a/common/buildcraft/api/bptblocks/BptBlockWallSide.java b/common/buildcraft/api/bptblocks/BptBlockWallSide.java index 4bf54818..8178d0f1 100644 --- a/common/buildcraft/api/bptblocks/BptBlockWallSide.java +++ b/common/buildcraft/api/bptblocks/BptBlockWallSide.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockWallSide extends BptBlock { public BptBlockWallSide(int blockId) { diff --git a/common/buildcraft/builders/BptBlockFiller.java b/common/buildcraft/builders/BptBlockFiller.java index f199108e..c3ae883f 100644 --- a/common/buildcraft/builders/BptBlockFiller.java +++ b/common/buildcraft/builders/BptBlockFiller.java @@ -22,6 +22,7 @@ import buildcraft.api.core.LaserKind; import buildcraft.api.core.Position; import buildcraft.core.Box; +@Deprecated public class BptBlockFiller extends BptBlock { public BptBlockFiller(int blockId) { diff --git a/common/buildcraft/energy/BptBlockEngine.java b/common/buildcraft/energy/BptBlockEngine.java index 452d314f..d0a2f187 100644 --- a/common/buildcraft/energy/BptBlockEngine.java +++ b/common/buildcraft/energy/BptBlockEngine.java @@ -17,6 +17,7 @@ import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; import buildcraft.core.Version; +@Deprecated public class BptBlockEngine extends BptBlock { public BptBlockEngine(int blockId) { diff --git a/common/buildcraft/factory/BptBlockAutoWorkbench.java b/common/buildcraft/factory/BptBlockAutoWorkbench.java index a120b6e8..5fad3b8c 100644 --- a/common/buildcraft/factory/BptBlockAutoWorkbench.java +++ b/common/buildcraft/factory/BptBlockAutoWorkbench.java @@ -18,6 +18,7 @@ import buildcraft.api.blueprints.BptBlockUtils; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockAutoWorkbench extends BptBlock { public BptBlockAutoWorkbench(int blockId) { diff --git a/common/buildcraft/factory/BptBlockFrame.java b/common/buildcraft/factory/BptBlockFrame.java index fe268f90..fd860e13 100644 --- a/common/buildcraft/factory/BptBlockFrame.java +++ b/common/buildcraft/factory/BptBlockFrame.java @@ -16,6 +16,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockFrame extends BptBlock { public BptBlockFrame(int blockId) { diff --git a/common/buildcraft/factory/BptBlockRefinery.java b/common/buildcraft/factory/BptBlockRefinery.java index 5f9420fa..f4d6a094 100644 --- a/common/buildcraft/factory/BptBlockRefinery.java +++ b/common/buildcraft/factory/BptBlockRefinery.java @@ -13,6 +13,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockRefinery extends BptBlock { public BptBlockRefinery(int blockId) { diff --git a/common/buildcraft/factory/BptBlockTank.java b/common/buildcraft/factory/BptBlockTank.java index ec5e33dc..4ba90ca4 100644 --- a/common/buildcraft/factory/BptBlockTank.java +++ b/common/buildcraft/factory/BptBlockTank.java @@ -4,6 +4,7 @@ import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.IBptContext; +@Deprecated public class BptBlockTank extends BptBlock { public BptBlockTank(int blockId) { diff --git a/common/buildcraft/transport/blueprints/BptBlockPipe.java b/common/buildcraft/transport/blueprints/BptBlockPipe.java index ff938765..4c9ff027 100644 --- a/common/buildcraft/transport/blueprints/BptBlockPipe.java +++ b/common/buildcraft/transport/blueprints/BptBlockPipe.java @@ -27,6 +27,7 @@ import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.GateVanilla; import buildcraft.transport.Pipe; +@Deprecated public class BptBlockPipe extends BptBlock { public BptBlockPipe(int blockId) { From 5703c85549a69ba832d42607b071bad79fb558d2 Mon Sep 17 00:00:00 2001 From: Krapht Date: Wed, 27 Mar 2013 17:15:20 +0100 Subject: [PATCH 54/93] Replace BCAction and BCTrigger arrays with IAction and ITrigger arrays. Good catch AartBluestoke --- common/buildcraft/transport/Pipe.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 43e00990..15299e21 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -36,8 +36,6 @@ import buildcraft.api.transport.IPipe; import buildcraft.core.IDropControlInventory; import buildcraft.core.network.TilePacketWrapper; import buildcraft.core.triggers.ActionRedstoneOutput; -import buildcraft.core.triggers.BCAction; -import buildcraft.core.triggers.BCTrigger; import buildcraft.core.utils.Utils; import buildcraft.transport.Gate.GateConditional; import buildcraft.transport.pipes.PipeLogic; @@ -68,9 +66,9 @@ public abstract class Pipe implements IPipe, IDropControlInventory { @SuppressWarnings("rawtypes") private static Map networkWrappers = new HashMap(); - public ITrigger[] activatedTriggers = new BCTrigger[8]; + public ITrigger[] activatedTriggers = new ITrigger[8]; public ITriggerParameter[] triggerParameters = new ITriggerParameter[8]; - public IAction[] activatedActions = new BCAction[8]; + public IAction[] activatedActions = new IAction[8]; public boolean broadcastSignal[] = new boolean[] { false, false, false, false }; public boolean broadcastRedstone = false; @@ -523,9 +521,9 @@ public abstract class Pipe implements IPipe, IDropControlInventory { public void resetGate() { gate = null; - activatedTriggers = new BCTrigger[activatedTriggers.length]; + activatedTriggers = new ITrigger[activatedTriggers.length]; triggerParameters = new ITriggerParameter[triggerParameters.length]; - activatedActions = new BCAction[activatedActions.length]; + activatedActions = new IAction[activatedActions.length]; broadcastSignal = new boolean[] { false, false, false, false }; if (broadcastRedstone) { updateNeighbors(true); From 4438947cab51ecd967503dad3c4c10ab2949c809 Mon Sep 17 00:00:00 2001 From: Krapht Date: Wed, 27 Mar 2013 21:47:45 +0100 Subject: [PATCH 55/93] Made the IPowerReceptor direction aware --- common/buildcraft/api/power/IPowerReceptor.java | 4 +++- common/buildcraft/builders/TileBuilder.java | 2 +- common/buildcraft/builders/TileFiller.java | 2 +- common/buildcraft/energy/TileEngine.java | 2 +- common/buildcraft/factory/TileMachine.java | 3 ++- common/buildcraft/silicon/TileLaser.java | 2 +- common/buildcraft/transport/PipeTransportPower.java | 2 +- common/buildcraft/transport/TileGenericPipe.java | 2 +- common/buildcraft/transport/pipes/PipeItemsObsidian.java | 2 +- common/buildcraft/transport/pipes/PipeItemsWood.java | 2 +- common/buildcraft/transport/pipes/PipeLiquidsWood.java | 2 +- common/buildcraft/transport/pipes/PipePowerWood.java | 2 +- 12 files changed, 15 insertions(+), 12 deletions(-) diff --git a/common/buildcraft/api/power/IPowerReceptor.java b/common/buildcraft/api/power/IPowerReceptor.java index 8fe6c83b..535f5049 100644 --- a/common/buildcraft/api/power/IPowerReceptor.java +++ b/common/buildcraft/api/power/IPowerReceptor.java @@ -9,6 +9,8 @@ package buildcraft.api.power; +import net.minecraftforge.common.ForgeDirection; + public interface IPowerReceptor { public void setPowerProvider(IPowerProvider provider); @@ -17,6 +19,6 @@ public interface IPowerReceptor { public void doWork(); - public int powerRequest(); + public int powerRequest(ForgeDirection validDirections); } diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index e193b149..032cb771 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -561,7 +561,7 @@ public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IP } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { if ((bluePrintBuilder != null || currentPathIterator != null) && !done) return powerProvider.getMaxEnergyReceived(); else diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index bbbdaeef..3ffb4000 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -356,7 +356,7 @@ public class TileFiller extends TileBuildCraft implements ISidedInventory, IPowe } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { if (isActive()) return powerProvider.getMaxEnergyReceived(); else diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index d1a565ca..d85fa1b6 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -389,7 +389,7 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { return 0; } diff --git a/common/buildcraft/factory/TileMachine.java b/common/buildcraft/factory/TileMachine.java index 92fb99c3..1a7d57b4 100644 --- a/common/buildcraft/factory/TileMachine.java +++ b/common/buildcraft/factory/TileMachine.java @@ -9,6 +9,7 @@ package buildcraft.factory; +import net.minecraftforge.common.ForgeDirection; import buildcraft.api.power.IPowerReceptor; import buildcraft.core.IMachine; import buildcraft.core.TileBuildCraft; @@ -16,7 +17,7 @@ import buildcraft.core.TileBuildCraft; public abstract class TileMachine extends TileBuildCraft implements IMachine, IPowerReceptor { @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { if (isActive()) return (int) Math.ceil(Math.min(getPowerProvider().getMaxEnergyReceived(), getPowerProvider().getMaxEnergyStored() - getPowerProvider().getEnergyStored())); diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index daa4abda..d46e8036 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -235,7 +235,7 @@ public class TileLaser extends TileBuildCraft implements IPowerReceptor { } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { if (powerProvider.getEnergyStored() < 200 || laser != null) return 25; else diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 3ceb7389..3c3e2a0e 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -161,7 +161,7 @@ public class PipeTransportPower extends PipeTransport { for (int i = 0; i < 6; ++i) { if (tiles[i] instanceof IPowerReceptor && !(tiles[i] instanceof TileGenericPipe)) { IPowerReceptor receptor = (IPowerReceptor) tiles[i]; - int request = receptor.powerRequest(); + int request = receptor.powerRequest(ForgeDirection.VALID_DIRECTIONS[i]); if (request > 0) { requestEnergy(ForgeDirection.VALID_DIRECTIONS[i], request); diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index e0056da7..627b9e18 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -406,7 +406,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { return getPowerProvider().getMaxEnergyReceived(); } diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index d8e070db..fa2f20bc 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -295,7 +295,7 @@ public class PipeItemsObsidian extends Pipe implements IPowerReceptor { } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { return getPowerProvider().getMaxEnergyReceived(); } } diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 777dae89..99139704 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -229,7 +229,7 @@ public class PipeItemsWood extends Pipe implements IPowerReceptor { } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { return getPowerProvider().getMaxEnergyReceived(); } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index 6acaea61..c670f551 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -145,7 +145,7 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { return getPowerProvider().getMaxEnergyReceived(); } diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index e152a07f..db80df8d 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -123,7 +123,7 @@ public class PipePowerWood extends Pipe implements IPowerReceptor { } @Override - public int powerRequest() { + public int powerRequest(ForgeDirection from) { return getPowerProvider().getMaxEnergyReceived(); } From 22d15a4c91c8d3073fafbd4715d6bdd2f743f003 Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Mar 2013 09:30:26 +0100 Subject: [PATCH 56/93] Fixed bad parameter name in IPowerReceptor. Fixed call to powerRequest calling with getOpposite in PipeTransportPower --- common/buildcraft/api/power/IPowerReceptor.java | 2 +- common/buildcraft/transport/PipeTransportPower.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/api/power/IPowerReceptor.java b/common/buildcraft/api/power/IPowerReceptor.java index 535f5049..661145e0 100644 --- a/common/buildcraft/api/power/IPowerReceptor.java +++ b/common/buildcraft/api/power/IPowerReceptor.java @@ -19,6 +19,6 @@ public interface IPowerReceptor { public void doWork(); - public int powerRequest(ForgeDirection validDirections); + public int powerRequest(ForgeDirection from); } diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 3c3e2a0e..4e4d2af7 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -161,7 +161,7 @@ public class PipeTransportPower extends PipeTransport { for (int i = 0; i < 6; ++i) { if (tiles[i] instanceof IPowerReceptor && !(tiles[i] instanceof TileGenericPipe)) { IPowerReceptor receptor = (IPowerReceptor) tiles[i]; - int request = receptor.powerRequest(ForgeDirection.VALID_DIRECTIONS[i]); + int request = receptor.powerRequest(ForgeDirection.VALID_DIRECTIONS[i].getOpposite()); if (request > 0) { requestEnergy(ForgeDirection.VALID_DIRECTIONS[i], request); From f9b69809936411e6cead81029896ecbd729cbd1a Mon Sep 17 00:00:00 2001 From: Flow86 Date: Thu, 28 Mar 2013 09:56:12 +0100 Subject: [PATCH 57/93] fix commit by TarzanBuzzyMan --- common/buildcraft/energy/BlockOilStill.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index 02ddc9c0..64361d3f 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -11,15 +11,19 @@ package buildcraft.energy; import net.minecraft.block.BlockStationary; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.liquids.ILiquid; import buildcraft.BuildCraftCore; import buildcraft.BuildCraftEnergy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockOilStill extends BlockStationary implements ILiquid { @SideOnly(Side.CLIENT) - private Icon[] field_94425_a; + private Icon[] theIcon; public BlockOilStill(int i, Material material) { super(i, material); @@ -52,17 +56,17 @@ public class BlockOilStill extends BlockStationary implements ILiquid { public boolean isBlockReplaceable(World world, int i, int j, int k) { return true; } - + @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister){ - this.field_94425_a = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + this.theIcon = new Icon[] { iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow") }; } @Override @SideOnly(Side.CLIENT) public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { - return par1 != 0 && par1 != 1 ? this.field_94425_a[1] : this.field_94425_a[0]; + return par1 != 0 && par1 != 1 ? this.theIcon[1] : this.theIcon[0]; } } From 4d92a9b918d825309a286096a31c07b6badc1c21 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Thu, 28 Mar 2013 10:00:05 +0100 Subject: [PATCH 58/93] fix RenderTank --- common/buildcraft/BuildCraftEnergy.java | 17 +++++++++++++++++ .../buildcraft/factory/render/RenderTank.java | 18 ++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index c178fb0c..b84b5318 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -12,11 +12,14 @@ import java.util.TreeMap; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.liquids.LiquidContainerData; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidDictionary; @@ -53,6 +56,8 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Mod(name = "BuildCraft Energy", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Energy", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandler.class, clientSideRequired = true, serverSideRequired = true) @@ -160,6 +165,18 @@ public class BuildCraftEnergy { bucketOil), new ItemStack(Item.bucketEmpty))); LiquidContainerRegistry.registerLiquid(new LiquidContainerData(LiquidDictionary.getLiquid("Fuel", LiquidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Item.bucketEmpty))); + + MinecraftForge.EVENT_BUS.register(this); + } + + @ForgeSubscribe + @SideOnly(Side.CLIENT) + public void textureHook(TextureStitchEvent.Post event) { + if (event.map == Minecraft.getMinecraft().renderEngine.textureMapItems) { + LiquidDictionary.getCanonicalLiquid("Fuel").setRenderingIcon(fuel.getIconFromDamage(0)); + } else { + LiquidDictionary.getCanonicalLiquid("Oil").setRenderingIcon(oilStill.getBlockTextureFromSide(1)); + } } public static void loadRecipes() { diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index 9d137daf..35e448fc 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -11,6 +11,7 @@ package buildcraft.factory.render; import java.util.HashMap; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -29,25 +30,34 @@ public class RenderTank extends TileEntitySpecialRenderer { final static private int displayStages = 100; - private HashMap stage = new HashMap(); + private final HashMap stage = new HashMap(); private int[] getDisplayLists(LiquidStack liquid, World world) { if (stage.containsKey(liquid)) { - return stage.get(liquid); + return stage.get(liquid); } int[] d = new int[displayStages]; stage.put(liquid, d); BlockInterface block = new BlockInterface(); + block.baseBlock = Block.waterStill; block.texture = liquid.getRenderingIcon(); - Minecraft.getMinecraft().renderEngine.bindTexture("/terrain.png"); + + String spriteSet = "/gui/items.png"; + + if (liquid.itemID < Block.blocksList.length) { + spriteSet = "/terrain.png"; + block.baseBlock = Block.blocksList[liquid.itemID]; + } for (int s = 0; s < displayStages; ++s) { d[s] = GLAllocation.generateDisplayLists(1); GL11.glNewList(d[s], 4864 /* GL_COMPILE */); + Minecraft.getMinecraft().renderEngine.bindTexture(spriteSet); + block.minX = 0.125 + 0.01; block.minY = 0; block.minZ = 0.125 + 0.01; @@ -71,7 +81,7 @@ public class RenderTank extends TileEntitySpecialRenderer { String liquidName = tank.tank.getLiquidName(); LiquidStack liquid = tank.tank.getLiquid(); - LiquidStack refLiquid = LiquidDictionary.getCanonicalLiquid(liquidName); + LiquidStack refLiquid = LiquidDictionary.getCanonicalLiquid(liquidName); if (refLiquid == null || liquid.amount <= 0) return; From 6642d4fac1e39c17e02970c17cd6b20f740c7a99 Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Thu, 28 Mar 2013 23:15:37 +1300 Subject: [PATCH 59/93] Update BlockOilFlowing.java Strip off unnecessary code after Krapht's Forge PR merge. --- common/buildcraft/energy/BlockOilFlowing.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index 4e72070f..2e8a8e37 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -30,9 +30,6 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { boolean isOptimalFlowDirection[] = new boolean[4]; int flowCost[] = new int[4]; - @SideOnly(Side.CLIENT) - private Icon[] field_94425_a; - public BlockOilFlowing(int i, Material material) { super(i, material); @@ -269,13 +266,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister){ - this.field_94425_a = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; + this.theIcon = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; } - @Override - @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { - return par1 != 0 && par1 != 1 ? this.field_94425_a[1] : this.field_94425_a[0]; - } - } From 254c671cec0fc46ed52d0591622c271a12a007fc Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Thu, 28 Mar 2013 23:19:19 +1300 Subject: [PATCH 60/93] Update BlockOilStill.java Strip off unnecessary code after Krapht's Forge PR merge. --- common/buildcraft/energy/BlockOilStill.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index 64361d3f..21bf3eed 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -22,9 +22,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockOilStill extends BlockStationary implements ILiquid { - @SideOnly(Side.CLIENT) - private Icon[] theIcon; - public BlockOilStill(int i, Material material) { super(i, material); @@ -63,10 +60,4 @@ public class BlockOilStill extends BlockStationary implements ILiquid { this.theIcon = new Icon[] { iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow") }; } - @Override - @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { - return par1 != 0 && par1 != 1 ? this.theIcon[1] : this.theIcon[0]; - } - } From e01ea820a0ee805af3a948c61f8625bf21e985d3 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Thu, 28 Mar 2013 11:58:56 +0100 Subject: [PATCH 61/93] null pointer check in rendertank --- common/buildcraft/factory/render/RenderTank.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index 35e448fc..e1dd9c7a 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -47,7 +47,7 @@ public class RenderTank extends TileEntitySpecialRenderer { String spriteSet = "/gui/items.png"; - if (liquid.itemID < Block.blocksList.length) { + if (liquid.itemID < Block.blocksList.length && Block.blocksList[liquid.itemID] != null) { spriteSet = "/terrain.png"; block.baseBlock = Block.blocksList[liquid.itemID]; } From bff16e6c9629827c1fe801e41387cf5703e844e7 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Thu, 28 Mar 2013 12:00:51 +0100 Subject: [PATCH 62/93] fix rendering of liquids in pipes --- .../transport/render/RenderPipe.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index 0342322d..15f1c18b 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -12,6 +12,7 @@ package buildcraft.transport.render; import java.util.HashMap; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -59,7 +60,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { public int[] centerVertical = new int[LIQUID_STAGES]; } - private HashMap> displayLiquidLists = new HashMap>(); + private final HashMap> displayLiquidLists = new HashMap>(); private final int[] angleY = { 0, 0, 270, 90, 0, 180 }; private final int[] angleZ = { 90, 270, 0, 0, 0, 0 }; @@ -94,9 +95,13 @@ public class RenderPipe extends TileEntitySpecialRenderer { displayLiquidLists.get(liquidId).put(meta, d); BlockInterface block = new BlockInterface(); + String spriteSet = "/gui/items.png"; + if (liquidId < Block.blocksList.length && Block.blocksList[liquidId] != null) { - block.texture = Block.blocksList[liquidId].getBlockTextureFromSideAndMetadata(0, meta); + block.baseBlock = Block.blocksList[liquidId]; + spriteSet = "/terrain.png"; } else { + block.baseBlock = Block.waterStill; block.texture = Item.itemsList[liquidId].getIconFromDamage(meta); } @@ -112,6 +117,8 @@ public class RenderPipe extends TileEntitySpecialRenderer { d.sideHorizontal[s] = GLAllocation.generateDisplayLists(1); GL11.glNewList(d.sideHorizontal[s], 4864 /* GL_COMPILE */); + Minecraft.getMinecraft().renderEngine.bindTexture(spriteSet); + block.minX = 0.0F; block.minZ = Utils.pipeMinPos + 0.01F; @@ -130,6 +137,8 @@ public class RenderPipe extends TileEntitySpecialRenderer { d.sideVertical[s] = GLAllocation.generateDisplayLists(1); GL11.glNewList(d.sideVertical[s], 4864 /* GL_COMPILE */); + Minecraft.getMinecraft().renderEngine.bindTexture(spriteSet); + block.minY = Utils.pipeMaxPos - 0.01; block.maxY = 1; @@ -148,6 +157,8 @@ public class RenderPipe extends TileEntitySpecialRenderer { d.centerHorizontal[s] = GLAllocation.generateDisplayLists(1); GL11.glNewList(d.centerHorizontal[s], 4864 /* GL_COMPILE */); + Minecraft.getMinecraft().renderEngine.bindTexture(spriteSet); + block.minX = Utils.pipeMinPos + 0.01; block.minZ = Utils.pipeMinPos + 0.01; @@ -166,6 +177,8 @@ public class RenderPipe extends TileEntitySpecialRenderer { d.centerVertical[s] = GLAllocation.generateDisplayLists(1); GL11.glNewList(d.centerVertical[s], 4864 /* GL_COMPILE */); + Minecraft.getMinecraft().renderEngine.bindTexture(spriteSet); + block.minY = Utils.pipeMinPos + 0.01; block.maxY = Utils.pipeMaxPos - 0.01; @@ -308,7 +321,7 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glDisable(2896 /* GL_LIGHTING */); - GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F); + GL11.glTranslatef((float) x, (float) y, (float) z); // sides @@ -347,8 +360,11 @@ public class RenderPipe extends TileEntitySpecialRenderer { case SOUTH: case NORTH: sides = true; + // Yes, this is kind of ugly, but was easier than transform the coordinates above. + GL11.glTranslatef(0.5F, 0.0F, 0.5F); GL11.glRotatef(angleY[i], 0, 1, 0); GL11.glRotatef(angleZ[i], 0, 0, 1); + GL11.glTranslatef(-0.5F, 0.0F, -0.5F); list = d.sideHorizontal[stage]; break; default: From 673ccb6b42faf4c45871ba4ce2e23d3ff1936320 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Thu, 28 Mar 2013 12:08:53 +0100 Subject: [PATCH 63/93] fix render refinery --- .../factory/render/RenderRefinery.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index bef16b51..1c4b8b6f 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -12,6 +12,7 @@ package buildcraft.factory.render; import java.util.HashMap; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GLAllocation; @@ -33,10 +34,10 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent static final float factor = (float) (1.0 / 16.0); - private ModelRenderer tank; - private ModelRenderer magnet[] = new ModelRenderer[4]; + private final ModelRenderer tank; + private final ModelRenderer magnet[] = new ModelRenderer[4]; - private ModelBase model = new ModelBase() { + private final ModelBase model = new ModelBase() { }; public RenderRefinery() { @@ -64,7 +65,7 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent final static private int displayStages = 100; - private HashMap> stage = new HashMap>(); + private final HashMap> stage = new HashMap>(); private int[] getDisplayLists(int liquidId, int damage, World world) { @@ -81,10 +82,14 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent BlockInterface block = new BlockInterface(); + String spriteSet = "/gui/items.png"; + // Retrieve the texture depending on type of item. if (liquidId < Block.blocksList.length && Block.blocksList[liquidId] != null) { - block.texture = Block.blocksList[liquidId].getBlockTextureFromSideAndMetadata(0, damage); + block.baseBlock = Block.blocksList[liquidId]; + spriteSet = "/terrain.png"; } else if (Item.itemsList[liquidId] != null) { + block.baseBlock = Block.waterStill; block.texture = Item.itemsList[liquidId].getIconFromDamage(damage); } else return null; @@ -93,6 +98,8 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent d[s] = GLAllocation.generateDisplayLists(1); GL11.glNewList(d[s], 4864 /* GL_COMPILE */); + Minecraft.getMinecraft().renderEngine.bindTexture(spriteSet); + block.minX = 0.5 - 4F * factor + 0.01; block.minY = 0; block.minZ = 0.5 - 4F * factor + 0.01; @@ -224,14 +231,11 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent theMagnet.render(factor); GL11.glTranslatef(0, -trans2, -12F * factor); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(-4F * factor, 0, -4F * factor); if (qty1 > 0) { int[] list1 = getDisplayLists(liquid1, liquidMeta1, tile.worldObj); if (list1 != null) { - setTextureFor(liquid1); GL11.glCallList(list1[(int) ((float) qty1 / (float) TileRefinery.LIQUID_PER_SLOT * (displayStages - 1))]); } } @@ -242,7 +246,6 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent int[] list2 = getDisplayLists(liquid2, liquidMeta2, tile.worldObj); if (list2 != null) { - setTextureFor(liquid2); GL11.glCallList(list2[(int) ((float) qty2 / (float) TileRefinery.LIQUID_PER_SLOT * (displayStages - 1))]); } } @@ -253,7 +256,6 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent int[] list3 = getDisplayLists(liquid3, liquidMeta3, tile.worldObj); if (list3 != null) { - setTextureFor(liquid3); GL11.glCallList(list3[(int) ((float) qty3 / (float) TileRefinery.LIQUID_PER_SLOT * (displayStages - 1))]); } } @@ -262,7 +264,4 @@ public class RenderRefinery extends TileEntitySpecialRenderer implements IInvent GL11.glEnable(2896 /* GL_LIGHTING */); GL11.glPopMatrix(); } - - public void setTextureFor(int liquidId) { - } } From cf4ecc45fb2034020fcadc6e4f9bab27971f5c08 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Thu, 28 Mar 2013 12:16:34 +0100 Subject: [PATCH 64/93] fix power pipes rendering --- common/buildcraft/transport/render/RenderPipe.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/RenderPipe.java index 15f1c18b..7be4d556 100644 --- a/common/buildcraft/transport/render/RenderPipe.java +++ b/common/buildcraft/transport/render/RenderPipe.java @@ -214,6 +214,8 @@ public class RenderPipe extends TileEntitySpecialRenderer { displayPowerList[s] = GLAllocation.generateDisplayLists(1); GL11.glNewList(displayPowerList[s], 4864 /* GL_COMPILE */); + Minecraft.getMinecraft().renderEngine.bindTexture("/terrain.png"); + float minSize = 0.005F; float unit = (size - minSize) / 2F / POWER_STAGES; @@ -288,15 +290,17 @@ public class RenderPipe extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glDisable(2896 /* GL_LIGHTING */); - GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F); + GL11.glTranslatef((float) x, (float) y, (float) z); int[] displayList = pow.overload ? displayPowerListOverload : displayPowerList; for (int i = 0; i < 6; ++i) { GL11.glPushMatrix(); + GL11.glTranslatef(0.5F, 0.0F, 0.5F); GL11.glRotatef(angleY[i], 0, 1, 0); GL11.glRotatef(angleZ[i], 0, 0, 1); + GL11.glTranslatef(-0.5F, 0.0F, -0.5F); if (pow.displayPower[i] >= 1.0) { short stage = pow.displayPower[i]; From 28f93b9dcc94e778706e4a0519991af47cb9cf60 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 28 Mar 2013 07:47:06 -0400 Subject: [PATCH 65/93] Printline die! --- common/buildcraft/transport/EnergyPulser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/buildcraft/transport/EnergyPulser.java b/common/buildcraft/transport/EnergyPulser.java index 6f9ba2ff..731eb6be 100644 --- a/common/buildcraft/transport/EnergyPulser.java +++ b/common/buildcraft/transport/EnergyPulser.java @@ -23,7 +23,6 @@ public class EnergyPulser { if (!singlePulse || !hasPulsed) { - System.out.printf("Pulsing%d\n",Math.min(1 << (pulseCount-1),64)); powerReceptor.getPowerProvider().receiveEnergy(Math.min(1 << (pulseCount-1),64), ForgeDirection.WEST); hasPulsed = true; } From 6d93b645e257726d493ab50102cca3f9adc40487 Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Mar 2013 16:44:03 +0100 Subject: [PATCH 66/93] Fir merge error --- common/buildcraft/transport/TileGenericPipe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 99952f45..fc41e147 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -408,7 +408,7 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank @Override public int powerRequest(ForgeDirection from) { if (BlockGenericPipe.isValid(pipe) && pipe instanceof IPowerReceptor) - return ((IPowerReceptor) pipe).powerRequest(); + return ((IPowerReceptor) pipe).powerRequest(from); return 0; } From 5bbf31f2791d30b14f604925c1f2811acc185b4b Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Mar 2013 17:00:52 +0100 Subject: [PATCH 67/93] Updated to forge 616 --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 15b69dda..518d158d 100644 --- a/build.xml +++ b/build.xml @@ -18,7 +18,7 @@ - + From dbc76521a2e8c51fe93603b20ba7d9a8c78055cf Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Mar 2013 21:40:21 +0100 Subject: [PATCH 68/93] Use the striped pipe as the breaked block texture, for now --- .../blocks/{block_7_14.png => pipeStripes.png} | Bin common/buildcraft/transport/BlockGenericPipe.java | 6 ++++++ common/buildcraft/transport/PipeIconProvider.java | 7 +++++-- 3 files changed, 11 insertions(+), 2 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_7_14.png => pipeStripes.png} (100%) diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_7_14.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pipeStripes.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_7_14.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pipeStripes.png diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 0d7ddf0b..997bf7ef 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -902,4 +902,10 @@ public class BlockGenericPipe extends BlockContainer { } } } + + @Override + @SideOnly(Side.CLIENT) + public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { + return BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.Stripes); + } } diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index f6f3f38c..a0ad7945 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -25,7 +25,7 @@ public class PipeIconProvider implements IIconProvider { public static final int PipeItemsIron_Standard = 14; public static final int PipeAllIron_Solid = 15; public static final int PipeItemsObsidian = 16; - public static final int PipeItemsSandstone = 17; + public static final int PipeItemsSandstone = 17; public static final int PipeItemsStone = 18; public static final int PipeItemsVoid = 19; public static final int PipeLiquidsCobblestone = 20; @@ -43,8 +43,10 @@ public class PipeIconProvider implements IIconProvider { public static final int Power_Normal = 31; public static final int Power_Overload = 32; - public static final int MAX = 33; + public static final int Stripes = 33; + public static final int MAX = 34; + private boolean registered = false; @SideOnly(Side.CLIENT) @@ -107,6 +109,7 @@ public class PipeIconProvider implements IIconProvider { _icons[PipeIconProvider.Power_Normal] = iconRegister.registerIcon("buildcraft:texture_cyan"); _icons[PipeIconProvider.Power_Overload] = iconRegister.registerIcon("buildcraft:texture_red_dark"); + _icons[PipeIconProvider.Stripes] = iconRegister.registerIcon("buildcraft:pipeStripes"); } } From 4545cf90e28ae0e418561788cb953835fc2f203f Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Thu, 28 Mar 2013 14:06:55 -0700 Subject: [PATCH 69/93] Fixed block particle effects They now use the correct texture (in theory). --- .../transport/BlockGenericPipe.java | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 997bf7ef..4d4228e2 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -43,6 +43,10 @@ import buildcraft.transport.render.PipeWorldRenderer; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.EntityDiggingFX; public class BlockGenericPipe extends BlockContainer { static enum Part { @@ -59,6 +63,8 @@ public class BlockGenericPipe extends BlockContainer { public Part hitPart; public MovingObjectPosition movingObjectPosition; } + + private static Random rand = new Random(); private boolean skippedFirstIconRegister; @@ -908,4 +914,96 @@ public class BlockGenericPipe extends BlockContainer { public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { return BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.Stripes); } + + /** + * Spawn a digging particle effect in the world, this is a wrapper around + * EffectRenderer.addBlockHitEffects to allow the block more control over + * the particles. Useful when you have entirely different texture sheets for + * different sides/locations in the world. + * + * @param world The current world + * @param target The target the player is looking at {x/y/z/side/sub} + * @param effectRenderer A reference to the current effect renderer. + * @return True to prevent vanilla digging particles form spawning. + */ + @SideOnly(Side.CLIENT) + @Override + public boolean addBlockHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { + int x = target.blockX; + int y = target.blockY; + int z = target.blockZ; + + int sideHit = target.sideHit; + + int meta = worldObj.getBlockMetadata(x, y, z); + + Block block = BuildCraftTransport.genericPipeBlock; + float b = 0.1F; + double px = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - (b * 2.0F)) + b + block.getBlockBoundsMinX(); + double py = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - (b * 2.0F)) + b + block.getBlockBoundsMinY(); + double pz = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - (b * 2.0F)) + b + block.getBlockBoundsMinZ(); + + if (sideHit == 0) { + py = (double) y + block.getBlockBoundsMinY() - (double) b; + } + + if (sideHit == 1) { + py = (double) y + block.getBlockBoundsMaxY() + (double) b; + } + + if (sideHit == 2) { + pz = (double) z + block.getBlockBoundsMinZ() - (double) b; + } + + if (sideHit == 3) { + pz = (double) z + block.getBlockBoundsMaxZ() + (double) b; + } + + if (sideHit == 4) { + px = (double) x + block.getBlockBoundsMinX() - (double) b; + } + + if (sideHit == 5) { + px = (double) x + block.getBlockBoundsMaxX() + (double) b; + } + + EntityDiggingFX fx = new EntityDiggingFX(worldObj, px, py, pz, 0.0D, 0.0D, 0.0D, block, sideHit, worldObj.getBlockMetadata(x, y, z), Minecraft.getMinecraft().renderEngine); + fx.func_94052_a(Minecraft.getMinecraft().renderEngine, getBlockTexture(worldObj, x, y, z, 0)); + effectRenderer.addEffect(fx.func_70596_a(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); + return true; + } + + /** + * Spawn particles for when the block is destroyed. Due to the nature of how + * this is invoked, the x/y/z locations are not always guaranteed to host + * your block. So be sure to do proper sanity checks before assuming that + * the location is this block. + * + * @param world The current world + * @param x X position to spawn the particle + * @param y Y position to spawn the particle + * @param z Z position to spawn the particle + * @param meta The metadata for the block before it was destroyed. + * @param effectRenderer A reference to the current effect renderer. + * @return True to prevent vanilla break particles from spawning. + */ + @SideOnly(Side.CLIENT) + @Override + public boolean addBlockDestroyEffects(World worldObj, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + byte its = 4; + for (int i = 0; i < its; ++i) { + for (int j = 0; j < its; ++j) { + for (int k = 0; k < its; ++k) { + double px = x + (i + 0.5D) / (double) its; + double py = y + (j + 0.5D) / (double) its; + double pz = z + (k + 0.5D) / (double) its; + int random = rand.nextInt(6); + EntityDiggingFX fx = new EntityDiggingFX(worldObj, px, py, pz, px - x - 0.5D, py - y - 0.5D, pz - z - 0.5D, BuildCraftTransport.genericPipeBlock, random, meta, Minecraft.getMinecraft().renderEngine); + fx.func_94052_a(Minecraft.getMinecraft().renderEngine, getBlockTexture(worldObj, x, y, z, 0)); + effectRenderer.addEffect(fx.func_70596_a(x, y, z)); + } + } + } + return true; + } } From d9db8bb0f5ecd406df0d961e327b308257c7c556 Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Mar 2013 22:22:18 +0100 Subject: [PATCH 70/93] * Fixed the breaking texture, good work CJ =) --- common/buildcraft/transport/BlockGenericPipe.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 4d4228e2..a3a51c1e 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -14,8 +14,12 @@ import java.util.List; import java.util.Random; import java.util.TreeMap; +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -43,10 +47,6 @@ import buildcraft.transport.render.PipeWorldRenderer; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityDiggingFX; public class BlockGenericPipe extends BlockContainer { static enum Part { @@ -990,6 +990,11 @@ public class BlockGenericPipe extends BlockContainer { @SideOnly(Side.CLIENT) @Override public boolean addBlockDestroyEffects(World worldObj, int x, int y, int z, int meta, EffectRenderer effectRenderer) { + Pipe pipe = getPipe(worldObj, x, y, z); + if (pipe == null) return false; + + Icon icon = BuildCraftTransport.instance.pipeIconProvider.getIcon(pipe.getIconIndexForItem()); + byte its = 4; for (int i = 0; i < its; ++i) { for (int j = 0; j < its; ++j) { @@ -999,7 +1004,7 @@ public class BlockGenericPipe extends BlockContainer { double pz = z + (k + 0.5D) / (double) its; int random = rand.nextInt(6); EntityDiggingFX fx = new EntityDiggingFX(worldObj, px, py, pz, px - x - 0.5D, py - y - 0.5D, pz - z - 0.5D, BuildCraftTransport.genericPipeBlock, random, meta, Minecraft.getMinecraft().renderEngine); - fx.func_94052_a(Minecraft.getMinecraft().renderEngine, getBlockTexture(worldObj, x, y, z, 0)); + fx.func_94052_a(Minecraft.getMinecraft().renderEngine, icon); effectRenderer.addEffect(fx.func_70596_a(x, y, z)); } } From c4820303c695c7c5bc672fb3e28d1c273689897d Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Mar 2013 22:48:18 +0100 Subject: [PATCH 71/93] Fixed the fuel texture --- .../mods/buildcraft/textures/items/fuel.png | Bin 0 -> 321 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/fuel.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/fuel.png b/buildcraft_resources/mods/buildcraft/textures/items/fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..d97df4dc3ea03234678f0eb2dbb71b7ef58d5eec GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lwb?+ z32{AgfG?kcAvOLRP=hkfv%BBh>@X{fvJ^&iLQZ( zm4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;78nZFV!$>8bg K=d#Wzp$PykcTR-> literal 0 HcmV?d00001 From d4a396e94a25d1ae239a539902bf018b076a8e80 Mon Sep 17 00:00:00 2001 From: Krapht Date: Thu, 28 Mar 2013 23:12:36 +0100 Subject: [PATCH 72/93] Fixed the hit effects and delete the old fuel png --- .../mods/buildcraft/textures/items/block_3_0.png | Bin 321 -> 0 bytes common/buildcraft/transport/BlockGenericPipe.java | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 buildcraft_resources/mods/buildcraft/textures/items/block_3_0.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/block_3_0.png b/buildcraft_resources/mods/buildcraft/textures/items/block_3_0.png deleted file mode 100644 index d97df4dc3ea03234678f0eb2dbb71b7ef58d5eec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lwb?+ z32{AgfG?kcAvOLRP=hkfv%BBh>@X{fvJ^&iLQZ( zm4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;78nZFV!$>8bg K=d#Wzp$PykcTR-> diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index a3a51c1e..454b48ae 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -932,11 +932,14 @@ public class BlockGenericPipe extends BlockContainer { int x = target.blockX; int y = target.blockY; int z = target.blockZ; + + Pipe pipe = getPipe(worldObj, x, y, z); + if (pipe == null) return false; + + Icon icon = BuildCraftTransport.instance.pipeIconProvider.getIcon(pipe.getIconIndexForItem()); int sideHit = target.sideHit; - int meta = worldObj.getBlockMetadata(x, y, z); - Block block = BuildCraftTransport.genericPipeBlock; float b = 0.1F; double px = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - (b * 2.0F)) + b + block.getBlockBoundsMinX(); @@ -968,7 +971,7 @@ public class BlockGenericPipe extends BlockContainer { } EntityDiggingFX fx = new EntityDiggingFX(worldObj, px, py, pz, 0.0D, 0.0D, 0.0D, block, sideHit, worldObj.getBlockMetadata(x, y, z), Minecraft.getMinecraft().renderEngine); - fx.func_94052_a(Minecraft.getMinecraft().renderEngine, getBlockTexture(worldObj, x, y, z, 0)); + fx.func_94052_a(Minecraft.getMinecraft().renderEngine, icon); effectRenderer.addEffect(fx.func_70596_a(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); return true; } From 53a8db85e820c50b7ad8a0b9bd246c0efa34e2c3 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 12:43:29 -0400 Subject: [PATCH 73/93] Fix up the rendering of gui engines. Closes #708 --- common/buildcraft/BuildCraftEnergy.java | 4 ++-- common/buildcraft/energy/gui/GuiCombustionEngine.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index b84b5318..adf70d56 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -173,9 +173,9 @@ public class BuildCraftEnergy { @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Post event) { if (event.map == Minecraft.getMinecraft().renderEngine.textureMapItems) { - LiquidDictionary.getCanonicalLiquid("Fuel").setRenderingIcon(fuel.getIconFromDamage(0)); + LiquidDictionary.getCanonicalLiquid("Fuel").setRenderingIcon(fuel.getIconFromDamage(0)).setTextureSheet("/gui/items.png"); } else { - LiquidDictionary.getCanonicalLiquid("Oil").setRenderingIcon(oilStill.getBlockTextureFromSide(1)); + LiquidDictionary.getCanonicalLiquid("Oil").setRenderingIcon(oilStill.getBlockTextureFromSide(1)).setTextureSheet("/terrain.png"); } } diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index c0db49db..ca02bd90 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -71,7 +71,8 @@ public class GuiCombustionEngine extends GuiEngine { squaled = 0; } - drawTexturedModelRectFromIcon(j + col, k + line + 58 - x - start, liquid.getRenderingIcon(), 16, 16 - (16 - x)); + mc.renderEngine.bindTexture(liquid.canonical().getTextureSheet()); + drawTexturedModelRectFromIcon(j + col, k + line + 58 - x - start, liquid.canonical().getRenderingIcon(), 16, 16 - (16 - x)); start = start + 16; if (x == 0 || squaled == 0) { From b341914b84f55bb4e6c5697f7bd0e897ac21cf1e Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 15:40:27 -0400 Subject: [PATCH 74/93] Fix up for liquidstack immutability --- common/buildcraft/energy/EngineIron.java | 8 +++---- common/buildcraft/factory/TileTank.java | 10 ++++---- .../buildcraft/factory/render/RenderTank.java | 9 +++---- .../transport/PipeTransportLiquids.java | 13 ++++------ .../transport/network/PacketLiquidUpdate.java | 24 +++++++------------ 5 files changed, 26 insertions(+), 38 deletions(-) diff --git a/common/buildcraft/energy/EngineIron.java b/common/buildcraft/energy/EngineIron.java index d39fd3fd..bbeea469 100644 --- a/common/buildcraft/energy/EngineIron.java +++ b/common/buildcraft/energy/EngineIron.java @@ -294,7 +294,7 @@ public class EngineIron extends Engine { if (fuelTank.getLiquid() == null) { fuelTank.setLiquid(new LiquidStack(j, 0)); } else { - fuelTank.getLiquid().itemID = j; + fuelTank.setLiquid(new LiquidStack(j,fuelTank.getLiquid().amount,fuelTank.getLiquid().itemMeta)); } break; case 7: @@ -308,21 +308,21 @@ public class EngineIron extends Engine { if (coolantTank.getLiquid() == null) { coolantTank.setLiquid(new LiquidStack(j, 0)); } else { - coolantTank.getLiquid().itemID = j; + coolantTank.setLiquid(new LiquidStack(j,coolantTank.getLiquid().amount,coolantTank.getLiquid().itemMeta)); } break; case 9: if (fuelTank.getLiquid() == null) { fuelTank.setLiquid(new LiquidStack(0, 0, j)); } else { - fuelTank.getLiquid().itemMeta = j; + fuelTank.setLiquid(new LiquidStack(fuelTank.getLiquid().itemID,fuelTank.getLiquid().amount,j)); } break; case 10: if (coolantTank.getLiquid() == null) { coolantTank.setLiquid(new LiquidStack(0, 0, j)); } else { - coolantTank.getLiquid().itemMeta = j; + coolantTank.setLiquid(new LiquidStack(coolantTank.getLiquid().itemID,coolantTank.getLiquid().amount,j)); } } } diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 6ccd32e4..7078cfd8 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -15,6 +15,7 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; +import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; import buildcraft.BuildCraftCore; @@ -84,9 +85,8 @@ public class TileTank extends TileBuildCraft implements ITankContainer { LiquidStack liquid = new LiquidStack(data.getInteger("liquidId"), data.getInteger("stored"), 0); tank.setLiquid(liquid); } else { - LiquidStack liquid = new LiquidStack(0, 0, 0); - liquid.readFromNBT(data.getCompoundTag("tank")); - if (Item.itemsList[liquid.itemID] != null && liquid.amount > 0) { + LiquidStack liquid = LiquidStack.loadLiquidStackFromNBT(data.getCompoundTag("tank")); + if (liquid != null) { tank.setLiquid(liquid); } } @@ -95,7 +95,7 @@ public class TileTank extends TileBuildCraft implements ITankContainer { @Override public void writeToNBT(NBTTagCompound data) { super.writeToNBT(data); - if (tank.getLiquid() != null) { + if (tank.containsValidLiquid()) { data.setTag("tank", tank.getLiquid().writeToNBT(new NBTTagCompound())); } } @@ -184,7 +184,7 @@ public class TileTank extends TileBuildCraft implements ITankContainer { resource = resource.copy(); int totalUsed = 0; TileTank tankToFill = getBottomTank(); - + LiquidStack liquid = tankToFill.tank.getLiquid(); if (liquid != null && liquid.amount > 0 && !liquid.isLiquidEqual(resource)) { return 0; diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index e1dd9c7a..1558f733 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -45,10 +45,9 @@ public class RenderTank extends TileEntitySpecialRenderer { block.baseBlock = Block.waterStill; block.texture = liquid.getRenderingIcon(); - String spriteSet = "/gui/items.png"; + String spriteSet = liquid.getTextureSheet(); if (liquid.itemID < Block.blocksList.length && Block.blocksList[liquid.itemID] != null) { - spriteSet = "/terrain.png"; block.baseBlock = Block.blocksList[liquid.itemID]; } @@ -79,9 +78,11 @@ public class RenderTank extends TileEntitySpecialRenderer { TileTank tank = ((TileTank) tileentity); - String liquidName = tank.tank.getLiquidName(); LiquidStack liquid = tank.tank.getLiquid(); - LiquidStack refLiquid = LiquidDictionary.getCanonicalLiquid(liquidName); + if (liquid == null) + return; + + LiquidStack refLiquid = liquid.canonical(); if (refLiquid == null || liquid.amount <= 0) return; diff --git a/common/buildcraft/transport/PipeTransportLiquids.java b/common/buildcraft/transport/PipeTransportLiquids.java index 6ceddf19..4dc1a593 100644 --- a/common/buildcraft/transport/PipeTransportLiquids.java +++ b/common/buildcraft/transport/PipeTransportLiquids.java @@ -209,7 +209,7 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine /** * Computes the PacketLiquidUpdate packet for transmission to a client - * + * * @param initPacket * everything is sent, no delta stuff ( first packet ) * @param persistChange @@ -257,16 +257,11 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine continue; } - if (prev.itemID != current.itemID || initPacket) { + if (!prev.equals(current) || initPacket) { changed = true; - renderCache[dir.ordinal()].itemID = current.itemID; + renderCache[dir.ordinal()] = current; delta.set(dir.ordinal() * 3 + 0); - } - - if (prev.itemMeta != current.itemMeta || initPacket) { - changed = true; - renderCache[dir.ordinal()].itemMeta = current.itemMeta; - delta.set(dir.ordinal() * 3 + 1); + delta.set(dir.ordinal() * 3 + 1); } int displayQty = (prev.amount * 4 + current.amount) / 5; diff --git a/common/buildcraft/transport/network/PacketLiquidUpdate.java b/common/buildcraft/transport/network/PacketLiquidUpdate.java index 056cebc4..7d602621 100644 --- a/common/buildcraft/transport/network/PacketLiquidUpdate.java +++ b/common/buildcraft/transport/network/PacketLiquidUpdate.java @@ -62,18 +62,15 @@ public class PacketLiquidUpdate extends PacketCoordinates { // System.out.printf("read %d, %d, %d = %s, %s%n", posX, posY, posZ, Arrays.toString(dBytes), delta); for (ForgeDirection dir : ForgeDirection.values()) { - if (renderCache[dir.ordinal()] == null) { - renderCache[dir.ordinal()] = new LiquidStack(0, 0, 0); - } - if (delta.get(dir.ordinal() * 3 + 0)) { - renderCache[dir.ordinal()].itemID = data.readShort(); - } - if (delta.get(dir.ordinal() * 3 + 1)) { - renderCache[dir.ordinal()].itemMeta = data.readShort(); + int amt = renderCache[dir.ordinal()] != null ? renderCache[dir.ordinal()].amount : 0; + renderCache[dir.ordinal()] = new LiquidStack(data.readShort(),amt,data.readShort()); } if (delta.get(dir.ordinal() * 3 + 2)) { - renderCache[dir.ordinal()].amount = Math.min(transLiq.getCapacity(), data.readShort()); + if (renderCache[dir.ordinal()] == null) { + renderCache[dir.ordinal()] = new LiquidStack(0,0); + } + renderCache[dir.ordinal()].amount = Math.min(transLiq.getCapacity(), data.readShort()); } } } @@ -92,15 +89,10 @@ public class PacketLiquidUpdate extends PacketCoordinates { if (delta.get(dir.ordinal() * 3 + 0)) { if (liquid != null) { data.writeShort(liquid.itemID); + data.writeShort(liquid.itemMeta); } else { data.writeShort(0); - } - } - if (delta.get(dir.ordinal() * 3 + 1)) { - if (liquid != null) { - data.writeShort(liquid.itemMeta); - } else { - data.writeShort(0); + data.writeShort(0); } } if (delta.get(dir.ordinal() * 3 + 2)) { From e6633ae6ff856d9fc0268dd7495e424635e2f3cb Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 18:17:49 -0400 Subject: [PATCH 75/93] Fix up engineiron to use the new tank persistence methods --- common/buildcraft/energy/EngineIron.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/common/buildcraft/energy/EngineIron.java b/common/buildcraft/energy/EngineIron.java index bbeea469..a465bc59 100644 --- a/common/buildcraft/energy/EngineIron.java +++ b/common/buildcraft/energy/EngineIron.java @@ -207,8 +207,8 @@ public class EngineIron extends Engine { if (nbttagcompound.hasKey("liquidId")) { fuelTank.setLiquid(new LiquidStack(nbttagcompound.getInteger("liquidId"), nbttagcompound.getInteger("liquidQty"), nbttagcompound .getInteger("liquidMeta"))); - } else if (nbttagcompound.hasKey("fuelTank")) { - fuelTank.setLiquid(LiquidStack.loadLiquidStackFromNBT(nbttagcompound.getCompoundTag("fuelTank"))); + } else { + fuelTank.readFromNBT(nbttagcompound.getCompoundTag("fuelTank")); } burnTime = nbttagcompound.getInteger("burnTime"); @@ -216,8 +216,8 @@ public class EngineIron extends Engine { if (nbttagcompound.hasKey("coolantId")) { coolantTank.setLiquid(new LiquidStack(nbttagcompound.getInteger("coolantId"), nbttagcompound.getInteger("coolantQty"), nbttagcompound .getInteger("coolantMeta"))); - } else if (nbttagcompound.hasKey("coolantTank")) { - coolantTank.setLiquid(LiquidStack.loadLiquidStackFromNBT(nbttagcompound.getCompoundTag("coolantTank"))); + } else { + coolantTank.readFromNBT(nbttagcompound.getCompoundTag("coolantTank")); } heat = nbttagcompound.getInteger("heat"); @@ -232,13 +232,8 @@ public class EngineIron extends Engine { @Override public void writeToNBT(NBTTagCompound nbttagcompound) { - if (fuelTank.getLiquid() != null) { - nbttagcompound.setTag("fuelTank", fuelTank.getLiquid().writeToNBT(new NBTTagCompound())); - } - - if (coolantTank.getLiquid() != null) { - nbttagcompound.setTag("coolantTank", coolantTank.getLiquid().writeToNBT(new NBTTagCompound())); - } + nbttagcompound.setTag("fuelTank", fuelTank.writeToNBT(new NBTTagCompound())); + nbttagcompound.setTag("coolantTank", coolantTank.writeToNBT(new NBTTagCompound())); nbttagcompound.setInteger("burnTime", burnTime); nbttagcompound.setInteger("heat", heat); From 5441e821ad6f2b810f7b62f8d42d1f43f44c7438 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 20:47:12 -0400 Subject: [PATCH 76/93] Fix trigger/action rendering --- common/buildcraft/BuildCraftCore.java | 10 +++++----- .../core/gui/GuiAdvancedInterface.java | 2 ++ .../triggers/ActionTriggerIconProvider.java | 17 +++++++---------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index fd8476ac..6a703761 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -127,7 +127,7 @@ public class BuildCraftCore { public static Icon stripesLaserTexture; @SideOnly(Side.CLIENT) public static Icon transparentTexture; - + @SideOnly(Side.CLIENT) public static IIconProvider iconProvider; @@ -161,7 +161,7 @@ public class BuildCraftCore { public static BptItem[] itemBptProps = new BptItem[Item.itemsList.length]; public static Logger bcLog = Logger.getLogger("Buildcraft"); - + public IIconProvider actionTriggerIconProvider = new ActionTriggerIconProvider(); @Instance("BuildCraft|Core") @@ -258,7 +258,7 @@ public class BuildCraftCore { diamondGearItem = (new ItemBuildCraft(diamondGearId.getInt())).setUnlocalizedName("diamondGearItem"); LanguageRegistry.addName(diamondGearItem, "Diamond Gear"); - + MinecraftForge.EVENT_BUS.register(this); } finally { @@ -316,14 +316,14 @@ public class BuildCraftCore { public void serverStarting(FMLServerStartingEvent event) { event.registerServerCommand(new CommandBuildCraft()); } - + @ForgeSubscribe @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Pre event){ if (event.map == Minecraft.getMinecraft().renderEngine.textureMapItems) { - //if (event.map.textureType == 1) { 'TODO Replace above iconProvider = new CoreIconProvider(); iconProvider.registerIcons(event.map); + actionTriggerIconProvider.registerIcons(event.map); } } diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index 2fd8f452..8c7df136 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -45,6 +45,8 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { if (getItemStack() != null) { drawStack(getItemStack()); } else if (getTexture() != null) { + mc.renderEngine.bindTexture("/gui/items.png"); + System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getTexture().getIconName(), getTexture().getOriginX(),getTexture().getOriginY(),cornerX + x, cornerY + y); drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getTexture(), 16, 16); } diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index 3901fd4b..ac1a9a39 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -7,11 +7,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class ActionTriggerIconProvider implements IIconProvider { - + public static final int Action_MachineControl_On = 0; public static final int Action_MachineControl_Off = 1; public static final int Action_MachineControl_Loop = 2; - + public static final int Trigger_EngineHeat_Blue = 3; public static final int Trigger_EngineHeat_Green = 4; public static final int Trigger_EngineHeat_Yellow = 5; @@ -43,12 +43,12 @@ public class ActionTriggerIconProvider implements IIconProvider { public static final int MAX = 31; - + @SideOnly(Side.CLIENT) private Icon[] icons; - + private boolean registered = false; - + @Override @SideOnly(Side.CLIENT) public Icon getIcon(int iconIndex) { @@ -58,14 +58,12 @@ public class ActionTriggerIconProvider implements IIconProvider { @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - if (registered) return; - registered = true; icons = new Icon[MAX]; - + icons[ActionTriggerIconProvider.Action_MachineControl_On] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_on"); icons[ActionTriggerIconProvider.Action_MachineControl_Off] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_off"); icons[ActionTriggerIconProvider.Action_MachineControl_Loop] = iconRegister.registerIcon("buildcraft:triggers/action_machinecontrol_loop"); - + icons[ActionTriggerIconProvider.Trigger_EngineHeat_Blue] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_blue"); icons[ActionTriggerIconProvider.Trigger_EngineHeat_Green] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_green"); icons[ActionTriggerIconProvider.Trigger_EngineHeat_Yellow] = iconRegister.registerIcon("buildcraft:triggers/trigger_engineheat_yellow"); @@ -94,7 +92,6 @@ public class ActionTriggerIconProvider implements IIconProvider { icons[ActionTriggerIconProvider.Trigger_PipeSignal_Yellow_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_pipesignal_yellow_inactive"); icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Active] = iconRegister.registerIcon("buildcraft:triggers/trigger_redstoneinput_active"); icons[ActionTriggerIconProvider.Trigger_RedstoneInput_Inactive] = iconRegister.registerIcon("buildcraft:triggers/trigger_redstoneinput_inactive"); - } } From 05c235da6f55b63265453fbaacabc8a440e05054 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 21:24:49 -0400 Subject: [PATCH 77/93] Fix lasers --- common/buildcraft/BuildCraftCore.java | 6 ++++++ common/buildcraft/core/proxy/CoreProxyClient.java | 6 ------ common/buildcraft/core/render/RenderEntityBlock.java | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 6a703761..f5756270 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -324,7 +324,13 @@ public class BuildCraftCore { iconProvider = new CoreIconProvider(); iconProvider.registerIcons(event.map); actionTriggerIconProvider.registerIcons(event.map); + } else if (event.map == Minecraft.getMinecraft().renderEngine.textureMapBlocks) { + BuildCraftCore.redLaserTexture = event.map.registerIcon("buildcraft:blockRedLaser"); + BuildCraftCore.blueLaserTexture = event.map.registerIcon("buildcraft:blockBlueLaser"); + BuildCraftCore.stripesLaserTexture = event.map.registerIcon("buildcraft:blockStripesLaser"); + BuildCraftCore.transparentTexture = event.map.registerIcon("buildcraft:blockTransparentLaser"); } + } public void loadRecipes() { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index cea72fab..fa078628 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -114,12 +114,6 @@ public class CoreProxyClient extends CoreProxy { RenderingRegistry.registerBlockHandler(BuildCraftCore.legacyPipeModel, new RenderingEntityBlocks()); RenderingRegistry.registerBlockHandler(new RenderingOil()); RenderingRegistry.registerBlockHandler(new RenderingMarkers()); - - TextureMap blockTextureMap = Minecraft.getMinecraft().renderEngine.textureMapItems; - BuildCraftCore.redLaserTexture = blockTextureMap.registerIcon("buildcraft:blockRedLaser"); - BuildCraftCore.blueLaserTexture = blockTextureMap.registerIcon("buildcraft:blockBlueLaser"); - BuildCraftCore.stripesLaserTexture = blockTextureMap.registerIcon("buildcraft:blockStripesLaser"); - BuildCraftCore.transparentTexture = blockTextureMap.registerIcon("buildcraft:blockTransparentLaser"); } @Override diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/render/RenderEntityBlock.java index 75181375..be2f12da 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/render/RenderEntityBlock.java @@ -68,6 +68,7 @@ public class RenderEntityBlock extends Render { World world = entity.worldObj; BlockInterface util = new BlockInterface(); util.texture = entity.texture; + loadTexture("/terrain.png"); for (int iBase = 0; iBase < entity.iSize; ++iBase) { for (int jBase = 0; jBase < entity.jSize; ++jBase) { @@ -86,7 +87,7 @@ public class RenderEntityBlock extends Render { util.maxZ = (remainZ > 1.0 ? 1.0 : remainZ); GL11.glPushMatrix(); - GL11.glTranslatef((float) i + 0.5F, (float) j + 0.5F, (float) k + 0.5F); + GL11.glTranslatef((float) i, (float) j, (float) k); GL11.glRotatef(entity.rotationX, 1, 0, 0); GL11.glRotatef(entity.rotationY, 0, 1, 0); GL11.glRotatef(entity.rotationZ, 0, 0, 1); From 4a5d5b219dedd3ec71875348c1d6b0f817775e4a Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 21:45:07 -0400 Subject: [PATCH 78/93] Fix filler GUI and world rendering --- common/buildcraft/BuildCraftBuilders.java | 26 +++++++++++++++++++ common/buildcraft/builders/BlockFiller.java | 3 +-- .../builders/BuilderProxyClient.java | 10 ------- common/buildcraft/builders/gui/GuiFiller.java | 1 + .../transport/PipeTransportLiquids.java | 24 ++++++++++------- .../transport/pipes/PipeLiquidsEmerald.java | 2 +- .../transport/pipes/PipeLiquidsWood.java | 23 +++++++++------- .../transport/pipes/PipeLogicWood.java | 2 +- 8 files changed, 57 insertions(+), 34 deletions(-) diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index c473d11c..8428f135 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -14,12 +14,17 @@ import java.util.LinkedList; import java.util.TreeMap; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.client.event.TextureLoadEvent; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; import buildcraft.api.blueprints.BptBlock; import buildcraft.api.bptblocks.BptBlockBed; import buildcraft.api.bptblocks.BptBlockCustomStack; @@ -47,6 +52,7 @@ import buildcraft.builders.BlockFiller; import buildcraft.builders.BlockMarker; import buildcraft.builders.BlockPathMarker; import buildcraft.builders.BptBlockFiller; +import buildcraft.builders.BuilderProxyClient; import buildcraft.builders.EventHandlerBuilders; import buildcraft.builders.FillerFillAll; import buildcraft.builders.FillerFillPyramid; @@ -82,6 +88,8 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Mod(name = "BuildCraft Builders", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Builders", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandlerBuilders.class, clientSideRequired = true, serverSideRequired = true) @@ -274,6 +282,8 @@ public class BuildCraftBuilders { BuildCraftCore.mainConfiguration.save(); } + MinecraftForge.EVENT_BUS.register(this); + // public static final Block music; // public static final Block cloth; // public static final Block tilledField; @@ -382,4 +392,20 @@ public class BuildCraftBuilders { TilePathMarker.clearAvailableMarkersList(); } + + @ForgeSubscribe + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre evt) { + if (evt.map == Minecraft.getMinecraft().renderEngine.textureMapBlocks) { + TextureMap terrainMap = evt.map; + BuilderProxyClient.fillerFillAllTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/fillAll"); + BuilderProxyClient.fillerClearTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/clear"); + BuilderProxyClient.fillerWallsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/walls"); + BuilderProxyClient.fillerStairsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/stairs"); + BuilderProxyClient.fillerFlattenTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/flatten"); + BuilderProxyClient.fillerPyramidTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/pyramid"); + } + } + + } diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 2c4b0e53..da62d996 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -109,8 +109,7 @@ public class BlockFiller extends BlockContainer { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister par1IconRegister) - { + public void registerIcons(IconRegister par1IconRegister) { textureTopOn = par1IconRegister.registerIcon("buildcraft:blockFillerTopOn"); textureTopOff = par1IconRegister.registerIcon("buildcraft:blockFillerTopOff"); textureSides = par1IconRegister.registerIcon("buildcraft:blockFillerSides"); diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 1f329a9c..3555d00b 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -13,16 +13,6 @@ public class BuilderProxyClient extends BuilderProxy { public static Icon fillerFlattenTexture; public static Icon fillerPyramidTexture; - - public void initializeTextures() { - TextureMap terrainMap = Minecraft.getMinecraft().renderEngine.textureMapItems; - fillerFillAllTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/fillAll"); - fillerClearTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/clear"); - fillerWallsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/walls"); - fillerStairsTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/stairs"); - fillerFlattenTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/flatten"); - fillerPyramidTexture = terrainMap.registerIcon("buildcraft:fillerPatterns/pyramid"); - } @Override public void registerClientHook() { BuildCraftBuilders.addHook(new ClientBuilderHook()); diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 128233ee..8c34f81d 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -52,6 +52,7 @@ public class GuiFiller extends GuiBuildCraft { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if (filler.currentPattern != null) { + mc.renderEngine.bindTexture("/terrain.png"); drawTexturedModelRectFromIcon(guiLeft + patternSymbolX, guiTop + patternSymbolY, filler.currentPattern.getTexture(), 16, 16); } diff --git a/common/buildcraft/transport/PipeTransportLiquids.java b/common/buildcraft/transport/PipeTransportLiquids.java index 4dc1a593..48036594 100644 --- a/common/buildcraft/transport/PipeTransportLiquids.java +++ b/common/buildcraft/transport/PipeTransportLiquids.java @@ -36,7 +36,7 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine private short currentTime = 0; // Tracks how much of the liquid is inbound in timeslots - private short[] incomming = new short[travelDelay]; + private int[] incomming = new int[travelDelay]; // Tracks how much is currently available (has spent it's inbound delaytime) @@ -88,36 +88,36 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine public void reset() { this.setLiquid(null); - incomming = new short[travelDelay]; + incomming = new int[travelDelay]; } public int getAvailable() { int all = this.getLiquid() != null ? this.getLiquid().amount : 0; - for (short slot : incomming) { + for (int slot : incomming) { all -= slot; } return all; } - public void readFromNBT(NBTTagCompound compoundTag) { + public LiquidTank readFromNBT(NBTTagCompound compoundTag) { + super.readFromNBT(compoundTag); this.setCapacity(compoundTag.getInteger("capacity")); for (int i = 0; i < travelDelay; ++i) { incomming[i] = compoundTag.getShort("in[" + i + "]"); } - setLiquid(LiquidStack.loadLiquidStackFromNBT(compoundTag)); + return this; } - public void writeToNBT(NBTTagCompound subTag) { + public NBTTagCompound writeToNBT(NBTTagCompound subTag) { subTag.setInteger("capacity", this.getCapacity()); for (int i = 0; i < travelDelay; ++i) { incomming[i] = subTag.getShort("in[" + i + "]"); } - if (this.getLiquid() != null) { - this.getLiquid().writeToNBT(subTag); - } + super.writeToNBT(subTag); + return subTag; } } @@ -138,7 +138,7 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine public byte initClient = 0; public short travelDelay = 12; - public short flowRate = 10; + public int flowRate = 10; public LiquidStack[] renderCache = new LiquidStack[orientations.length]; private final PipeSection[] internalTanks = new PipeSection[orientations.length]; @@ -550,4 +550,8 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine // TODO Auto-generated method stub return null; } + + public void forceSize(ForgeDirection dir, int maxCapacity) { + internalTanks[dir.ordinal()].setCapacity(maxCapacity); + } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java index 6b8e1726..d215be4f 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java @@ -23,7 +23,7 @@ public class PipeLiquidsEmerald extends PipeLiquidsWood { standardIconIndex = PipeIconProvider.PipeLiquidsEmerald_Standard; solidIconIndex = PipeIconProvider.PipeAllEmerald_Solid; - ((PipeTransportLiquids) transport).flowRate = 40; + ((PipeTransportLiquids) transport).flowRate = Short.MAX_VALUE - 1; ((PipeTransportLiquids) transport).travelDelay = 4; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index c670f551..d4e1ada1 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -45,13 +45,15 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { public PipeLiquidsWood(int itemID) { this(new PipeLogicWood(), itemID); } - + protected PipeLiquidsWood(PipeLogic logic, int itemID) { super(new PipeTransportLiquids(), logic, itemID); powerProvider = PowerFramework.currentFramework.createPowerProvider(); - powerProvider.configure(50, 1, 100, 1, 250); - powerProvider.configurePowerPerdition(1, 1); + powerProvider.configure(50, 1, 64, 1, 250); + powerProvider.configurePowerPerdition(64, 1); + ((PipeTransportLiquids) transport).flowRate = 1000; + ((PipeTransportLiquids) transport).travelDelay = 2; } /** @@ -59,7 +61,7 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { */ @Override public void doWork() { - if (powerProvider.getEnergyStored() <= 0) + if (powerProvider.getEnergyStored() <= 0 || liquidToExtract > LiquidContainerRegistry.BUCKET_VOLUME * 4.0f) return; World w = worldObj; @@ -77,9 +79,10 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { if (!PipeManager.canExtractLiquids(this, w, (int) pos.x, (int) pos.y, (int) pos.z)) return; - if (liquidToExtract <= LiquidContainerRegistry.BUCKET_VOLUME) { - liquidToExtract += powerProvider.useEnergy(1, 1, true) * LiquidContainerRegistry.BUCKET_VOLUME; - } + double p = powerProvider.useEnergy(1, 64, true); + double d = ( Math.log(p)/Math.log(2) + 1 ) * LiquidContainerRegistry.BUCKET_VOLUME / 7.0f; + System.out.printf("Extracting %f %f %f\n",p,d,( Math.log(p)/Math.log(2) + 1 )); + liquidToExtract = (int)Math.floor(d); } } @@ -108,15 +111,15 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { if (tile instanceof ITankContainer) { ITankContainer container = (ITankContainer) tile; - int flowRate = ((PipeTransportLiquids) transport).flowRate; - - LiquidStack extracted = container.drain(pos.orientation.getOpposite(), liquidToExtract > flowRate ? flowRate : liquidToExtract, false); + LiquidStack extracted = container.drain(pos.orientation.getOpposite(), liquidToExtract, false); int inserted = 0; if (extracted != null) { + System.out.printf("Can extract %d of %d\n", extracted.amount, extracted.itemID); inserted = ((PipeTransportLiquids) transport).fill(pos.orientation, extracted, true); container.drain(pos.orientation.getOpposite(), inserted, true); + System.out.printf("Did extract %d of %d\n", inserted, extracted.itemID); } liquidToExtract -= inserted; diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index 19bb1f16..10dc9af0 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -43,7 +43,7 @@ public class PipeLogicWood extends PipeLogic { } if (newMeta != meta) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta,0); + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta,3); container.scheduleRenderUpdate(); // worldObj.markBlockNeedsUpdate(xCoord, yCoord, zCoord); } From 738d5ede52145791674cc33f8f755086107535e2 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 22:55:53 -0400 Subject: [PATCH 79/93] Fix oil, fuel, quarry and pump --- .../mods/buildcraft/textures/blocks/oil.png | Bin 4106 -> 6183 bytes .../buildcraft/textures/blocks/oil_flow.png | Bin 4980 -> 4853 bytes .../blocks/{block_6_6.png => pump_tube.png} | Bin .../mods/buildcraft/textures/items/fuel.png | Bin 321 -> 13744 bytes .../mods/buildcraft/textures/items/fuel.txt | 32 ++++++++++++++++++ common/buildcraft/BuildCraftFactory.java | 22 ++++++++++++ .../buildcraft/api/blueprints/BptBlock.java | 4 +-- common/buildcraft/core/EntityRobot.java | 5 +-- .../core/render/RenderingEntityBlocks.java | 5 +-- common/buildcraft/factory/BlockFrame.java | 4 +-- common/buildcraft/factory/BlockPump.java | 4 +-- .../factory/FactoryProxyClient.java | 10 ++---- 12 files changed, 69 insertions(+), 17 deletions(-) rename buildcraft_resources/mods/buildcraft/textures/blocks/{block_6_6.png => pump_tube.png} (100%) create mode 100644 buildcraft_resources/mods/buildcraft/textures/items/fuel.txt diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/oil.png b/buildcraft_resources/mods/buildcraft/textures/blocks/oil.png index 6eacbd51957eb2925283ab392b20e756764a51bf..bc09b4f6d3f1dcbb8be11a35be3c80ebcf0e2a18 100644 GIT binary patch literal 6183 zcmV+?7})2DP)P@owk1m>7zhMF zD4E&Y%qIKapSu0=pKN9YuMOM(?`D>4`|F?En{E4DwhuNt{>(UO+kWpK<{QiQ$6vc` zUo_%mZ~xMQOK&*fV|#7c4$k z*e<=|PfKR@H*Udj0+UPk&-{v$KGXI_-hMxE-}i0g{bW9{ew%l{f)(E|V~*Q4V2ey$ zf!%yWb`bq!87u$46})(LfNj$|z@SDmt3C@&4r+4WCdQSw+sH*;{FzHXoY+mdis6_{ zpPTZq&6Iy(E3*2c!5p@k8FB9~AB(aL&V9SAw*C9&hO)grZC^CO&;~Ob()Qwed!yku z@n97@@Y~t(AY(R)fXIqlYdXMc2N@Q~F>urM%Xd7;MT~=kwu=3)+m*dBLsoF`fZwkR zErMQ9(-Wl z6*v9;10KxVzeiljtK%npAn(b{ehUVPu*UHz+ZFCuTKFIQ&cSN~e8j4Fpo_?1Y>`Da z!|*0E%Q;xa7Oa2XKTp_vHP+xjUk?M8vE#wo!-E#A2RH49;KAF>ax$|&x2ss-8x;@S z8W&tuF|)<-V1}VoOj*J$>TKMUANVcYfRk$nmF>zeR6!-jg9om{EwT3SVBAg;4e;Sg zicl9n!8=(0vv{eSnZ0xj6qR_8uY;K<|Nr2@2i8Q02Ni?%7Cg`^-0`4c^hXRDPe{h{ zcB6AVumBS*xPK0Gbv)>;LOmG`%>Tdh#1=SMJxP;QJCh%j&gGX5UNo9A@qmyv$aH>S zg|3k$>OyH^b>z&B2W!FdY%r7o-{wpCC3rAi;en2PlbB(2dr^LHAkx8%v}lww=8Cl|rd0+6}h;f-b03jZ%@OyOQ z-|~a^cJ>MMe%L=S}dS7665TR68ELz#DDj z5*FdX0zoHaPlCXVC|JUHkFqpZ3tGeCxNa{Wcv*a|nM z;mw4rdTgKj(zTESexUKh8U>y!*1xa5H-Kaf@E}Kc@Wz#V!V5J48o$DtB$zb8gBO6+ zy%SOS=3{UbE6~Xf0GDcJDZ+q+dn`d5VQ_D2gvwb~Ctq741%tm^2M=1ugXhQ+`5_MM z9X`R4DHX9WD2EpnEMG2Ch^L)*?it!pX90@eviL_C*|$T zDInYtbK9{#!-%F}ZxA@Pr2@0Y$=~Rpf(Lh4;!d`w4kE8&k%RckRK!^%jCiE>683Ip_A0^D`KbQ_JXpodzf=;fxYs%0 z2ZmWV#S2dyScRcHMa>~Uc(@%r;j;OS6Ko{IoOw(sGT#>Pgbda?OT5sEaN?z-GwX~@ zn&q*MuGl)jk~REa1uPO-$b~?0z=IZ0eo8@i$uX^dDSro{FENnruWSb9OMX{0RY%h? za6kFA&4wSB6IS3m7>h@c1w3Rt$Pe7w?)bKLkviGe!W~Pus{AjmY!#7y#{+fex#K4W z5iS$sg#zHHol9@PgNO42S{YXx^NWg$FGuJimvs|7Xdsvi#^QhnUx?DGFw-}zRE4>R z^Mk(yG)DA_CV1fdx)i)vF5G;T8JS#PE`f3#IoRC8i2@<62GPk7 z2$3g#Kx0}0EXWXGnj~~m*=E5yJc+={$ZgjXNi>th4o!py!*L)9c#mr`BC0;6cNIDadv`-9uAwaczXs zXu{yW-~t``(v`M8V8G^p0t`L|?Shpo9SL9unF7?UL8#N?2Y$j*pjJnUrVs8zm}{kH z`u9baQ%$%)KiGq=A~rsBvYkGCUpUbm@dFbvD#3u}o}M^}6(*T?>y+Aj44&Ei}h;0~vhsVWs5?YpE+_S>c)nIkqHti%kHpGrU;F5?49 zpIF%}E6ZRFf=HMAAWBSC(Ue9RpGr&oyJNZOYms1!tgHp%y<6b^Wj})l6`z}-0Cw@okfZOT9t$E(zaMF9@d^(;ibP9+cp~CPIu~ z-CiksnUKW%&p{qy-@h;idZMOIFY%xTO11{xEI-}xph&&J0EDiA7*%kU=0x)=2y@gk zo7|GWb}ttaP){c0zyBaVsDXCeBze<-T1lDeQ%-Wj0ChFzT$v3`S zSGE8|vZ&aa#C^Ch{UwD9gGhu0_A!d8mG~xcFVYZ9gz3q)0>|GwgA}=Y*5+idKbSA{ z#7L-ot0g|AuA)iE{|p&{j29j< z3oi@yGgV1k`#}CchIa*@+@YO|X<$TZ=Sunr=8gQo5XH_ib+-*@SQ+wiJZK!03+*Te zV>I;A1CgezmDPvBHm%FQfgdD0R!$#GTjK>St6UNKxkY~T_(2nN&UW57*(3vEG$fYM zRXcA>9qd>Hdn2To#0jm#4@@d$9#?qKD|8%sc%X^7A;|13YKfjN8ib{?==XgQ(G=zy z^)`|WVhSA0TEr(bS-PwkCLVnGpchG*-@n0w830t=FHE5KRh-KY

    U<;7{ZS0~qKG zcfVfHz5_onQ8Lt({USv@lV8CqK+=M^kycm{5|%3^>n8VogMlp!JR?@hLVv%?S=jq- zNCQUw78I-aRQm}&;B2NSUa$zd?7T7J&ZzBe=dBjK(%S(%aU~wSI{75s7e3;oV-b&Z z6)!Xqa53YkOC;o@1by!X<=!3VPs;*ZH%rl zoPsV@F;YiYEgEnnJJ&5+C#61;kQ0@!;)T`D?JV|vuDz-U4Kx<{qC?bHq-1139nM>( za-lJ)W9b>wDmjJ&9xOq;K>WMQcs!uHocO^bNDcMyV2>Aw2Nj0mE0EFs3nrd82E=>C zgBp0L#?`2Ju-LKlh+F5cVx6;}fZYUM7uhbuc;pBV^q?Yg_)TW#KwWF#ku>mlM><;( zv>C+yxvU59gFT96jb^0iH;Xq;?!^y|JYRwEwsti20a@Uci-|s#9SgIRtS4>b5V zknN=tU_^z_vnm^&N4?p(==&3qZIv{NQJnwRMV4#mz+1=<{iSBtw9nFtSizo7psKPc9zE4U&QX6OBlhw=fkt}3D{vs$AN(L?)!w+Qfy z)Ea0V!U^Mg!G*zmi3bbo4{~6>+^+l~q69tEz%i(H?tAiK|0!%;5j*VGOMdV`c>p7{ zxl>}YpJlOQE3+k_{UhQ9${{Q5d$RMc31zBxLFyFo15HX&%^{OdhFxXEJ#K1s2EhZf<35iy%ev12Klqf8fDmwKHrDLe zor@W-QTTzw{$V#!3nF&nfq@^m!x;*aG@ne$ZzuRG5F$@_!1{wlbhP#j9#mF%P2dOG zfY3x5Ux|tTEtgh0cyNQFx96gn?V|{#`+ey%>9um{#0E@e7KvcF2W(-v@nZ3Q4eRKv ziTvO#gras18gN^8#e=U4H=l+6>{azq1BIW77n)tRSa&W{CMy6AlGX2E-`Z)X% z3DOdD*e&RvW5=*7FRR~uFF6^1E+|iY*_=ZW; zy`5;L01s9{Chm9q1-7toYu+Md1WS-IY?1}P`7Ee@{xf(`+>jPYhc_V`obo1`%D~#Z zC_SKqTjXjFRbli6y)8&uhQ1VwcUHQt&i+^_2uw@q;Gm|@&5pHLyO9w%9s!JTU#rPt zJ7shi*aXW)$PZ?T7jhA>FiD?lJyMn1NQwswK-TeK4i?)%PyCXIrP{f?{98Pr5ZSAa z8|+xqzo$t48Q6RT^Ft7<)^fp8l`CpTmP39a;s;}}cpMKLoo0_0vP2}eARDfE_?u&* z<3Sd{Sc7z`MmUN6QQy`tE7G<`hh89Gl1GdNvISsUHII}6B;tXqop-0(6&|R5pk)?` z5lhseX_jPdw)0+wmL)A1Q5+3-*@W$c2P#mHq94rSjCT&8O{KV}dA4J}phJsT_CL7W zv3qL{Vo4LkI%IhmE9m}(QSe}28wsfo<$xN+-RxNCmxu?NU$22BvY5$dVTt&G#tBIv zZjSJPomTv0qaYCRV9)w6`#(!M#O!)o-oCHxDfYdBaA;#0E%4b{Due8+c%e$>bI{uT zo&;caY(ll0cCr2@$X?L`uP8@pV{TJrbIKf5OY}NCQ)A4MpyAc6y!?lRH$`-03R63J z7m0^%c5apa(YdlpS(p(!tK}aE#ufUCbEGFObrJab!-D<(N^!;j4@|_Do8ZCT~WcpOJJ;e)-w0?Z9_xW9C&5dNFH!H z79@A=yOL`iKy7_gxn=v&k%DxW8SA*3@&oQ|wjkd~2{}1ie+F2mZJqpJZEbP$Et(_~ z41fRV%)&~F!)nkKiUl|SXuROet!j(tUcEA_2FX+hJ~|+G0#DuRG+yxo{l?XfRkG|Q zSG0g3L*g)S0L6n3+{zapiNWbifyUTG`5X*8s-ji+4ic6((c$-p+VI7%Zz=&+WvWqe zMzXj*r~4p}URVW6a(zHfG{NoNHh@!*MR^)LQn|HQXU z)y?{az#g15=8V|Q+yW_#RrGE*MZ1yI3l&E<%IsA4s?@w!(B|*e+({9&AfFILb%Q>C zK}*knApA`NvU}&gKRX^N2jW~7y0dEiX%52OhaGnh+cN7r=A9gJ8eIe4z#DgV3 z1X#jO&t z4)9X@CXnBQZ;7bCw))w72iBiR*7aK6)ZPPKqOHj$5!;RjQPWj!41Z!^6K0 z**94iJ9ntMv^-qN-ZK8GXp60~!>jE*ztIo)k|gaQQb5h33q-ofAOhVd`9cZkD# z*yn0cY)tUL#H8K5jfw}$H)_A`Hq6l`QSG%H6+JtCp7ca*UC}!Du;(0lcu?&4AWSVM zIu$g{9VS8n?hf_$kYAWD;-gh0FmFay7%yv86es{gBYtqGwb!>u-=W%`ZgH zZjGMPqMHM6Q58rpLTy6-3h^LvSvjaVNkM3I3b0KoBC4?XPjM`!Pa4<$2b?lK&-H0& z2}@t7^~q1s4)|QZE*?bN^fZaNs~r^QHH)SDyu+D^szjU2%*~E_SXMaT(|%r`!e1Hqvei9F6g#1iUG2^L^ z<~?neu9E4V?A#_eDIWZ0{U7a6a&rGAkO137ML-foqh3AFRquC8NPiY8 znmy@5pXcg$!1ia~J~5Wv81#AXZ!(lSOjYrKkgthL`yZjN0ZPCC1{DAR002ovPDHLk FV1lP`rP=@h literal 4106 zcmV+l5cThgP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000FwNklvOV49eeK6a|3B1b^f@ca9lbIzps zgb*l%Ktx1ITbPI_=S-zsq{&a@nuvZMxhA6DPj?|{3)J1nIa3TFP>hl7_ecUn^sj>Y z3$((VGldW+ZQC~d4^kzcnFs4u&>PsK)xHn{)dQc(mu2M3k85d+B$L{CfQYgDlMuqH zJkUrXYMXu|9&qaX#)GzRr9!C%I}h4{ktR|*>6{0O3QFNtLWxt=RvI-MzL^JWR#U0HzA|iDTtK&xcU);7y5~ z2Mh5aax0ExACwl%+XvFh<2;b1qT)f%B!qa-iciG@Zh?V$!2R8M@E9Jv%tQ+h+;22G z93l^TqEzvKGc0;MAY%3#>p~_Tj3$%wpyMx$eyH*nMn)#Y1H|cc9-PgCmIY=WjQj=X zfxrV~^L|(XHxAAN=K;(EZZ^U^K;s8p9*nFJhzDH3){->`VVnm752pMDOFS`zFsDr4 zx&U>-NyAP-QHu@%frrucCw^mqWr6GyoT$MT@oaT5>P({;`R9S^R{0$I#oa2|Y! z2crnyx9|Y{OrKwvU!ARbu*X!bgLnfTaOuTeF>23sEy#mW+(=SuhzG+#ta*T}i7lm4 zdk9>^gAf8mr0`mvYdb@o2l>NcVVDORGw(Vc6rJhrGf9_+lt5&c2b|&XQ69V*7|1bg zjtA+>c|b&SJP08;4=&+>x`NV`pPwK8L=|$GP`z0x@&NG@uI0gtGFf==c6q?*4oBUE zIHQTj@xW3^k=*&t_c!vO96K8FU^EV;D?=Xi3c;Ci-2Or@62gPhrJl*3P#*L)E3fClp1@$`fyrMup9fNuD`}hTJW$#P$X$|2>f-}> zAhtl_f#|V}cu-4b*M$NK=~Juy%ijA856+1n^sYgh;=y6@gS`SP4_?N=dGI(MXze6; z*SF=t-hvn-w7 z5`enFd+!>kJm7ujX&$ieJ0o_o>3wJC!9)dcY@Oo)7hC@u0Gt=Ij=r<3S^xk507*qo IM6N<$f~^U!eETI6FvDO*WRI+kWyTh=WEqUI zma$}Mnmm!Rjy=N6L^Ec}?`V0xzw7$_u5+F1oa;XSocn#hKkv`$zGH2y&323YDFOn4 zc3YU6*aA;k5NHQT_z&O>i+7;`k3X(hnwfyMwy(UFl2l-1=WTPR01!xY|MtxX%F2-f z28HfgSeXiq2^``V)YR2|`w9dSi?A^H>jLV-=Umr-k0)zQU2dAxOb4ifSzB8(mHNky zi3q+v)qm2wqz(Jv6m%rm!q>;*uyBDS*=Wt!WXsGXH>QCc9vj2{yhV&%IAgLUSFjb% z{l-`@`2st<85D&S%t#`zKWb4sQk%Q4!B^d8opeNFl~(-L6te;`Q({z;FLa%;XtHGf zR3agoNLDor3-+;m@a?o>0X3r>z6M?9bFvgN#Hj*%S z_~{v@X3GIh74j~f4}BqI3&(&EAP5%RF7!YNv-1-=sG*jkoy(Joij>KJla(EPsI^}{ z&&Y^R4wr0XE~~ItY=^k8@?M*Ep-F)?J~jv=8{&UMaQ}tbk2X3L8p*QpZkOpvSDAAd zdZxRNC1yszpeMSt7a3WkA3jkA|Ia-N;|VeCn_5&6g_W)2*upK-nX=zC4J9OA$^YC@ z&iunAeZF&=5I5bWOAHR;@6){dDVkNWOUhHh+5bq*A2}*vXZ7n-g2AU7-Dc6rrz=m5 z=V&Y$pUh-WM<=~T3~k88x4~GxyE4bTwT}0G)*`BO50m#*su?q!XXWLl@<)5GI%mv4 zTX*OC7ZY4c{QH`RUFw5xr4M_xeiAU4T-`@p#~n&w9SF~-=qg^Ek0Rbr{!5?IdI69t zxPSmm;FnnN1aQsET9vEz-QXi7G$)KDXjcMp?1G{flLXA z`~0BKyR#V{P7)<3Ynk$4k2)VZI{YGf&mLH1LZH`DCOVM+KI2tL^?x!r8GGZB#4q<$ z_aikK@9$v?D6HFAEh$)EdqS@9(aoG=O3Rk%!-)3xmf3@K(aCA3J*v5N|MAZXj7^$L zdoBD*jB3#+9qwa4&IK)tKk?pimNi{k^tlk$mH$`*4@Hy>kHuW8A8)0QP7Ej(j+65` z2AGmJ4ga3E%A(;NIPrB?*zE>V-hs1G-MW|Ov^nkFl+uQNWTa;aTO`hFJo{oruAs}S z9xd<>(@Y8=IUqBGuO$Yr#l#|hNbuV#V5q_x-~Vz8ZZOo{S5*&|r^j87Uh_?RH_h<$ z&F7)^@n<_|d zjlCNu z*`msN2<|ELI&E$X2TNFmJZz#h&0=f&Np@4}i|`F3Sk*HwNwK~m5>OQIbvui1b+^it zfC_?%vr>>DA@(u}U=snG8DL~dfLs6`b->7qNF9clGk|f)1`|XweM%ra0lbXlwnLe? z!9#n+gm?0b{1m{*{AbB*m(I3L_#h}@h_`jXM&6S?j86QufRhg3%~Nq-BWFrI@e-RE zz?|!pTzBOs_dV}tLb?#{?^wkrF3E?!rK@j^nO0@rIo;HDY&zBZlV+qRJ~Q5-5`Kn< zQj@CG^gif)sU=E`H#XfZx!C3LPpa`12DdEP(VQo`U z0ZPcd^IUDZ6*FGhYxY(9Q=E+>S;B?h@(xw7$1^d(j+bDQY{!?$xvHq3zuuhM)@~mg z4bGVr7$${cCk2M`Q`Y%zM!kk2p3}AV+oZ7>VqiC6so?ba$sH;83I@yJso_eeov0x% zg^IUDos^pc|45OP2}IrkQb_zDpCG@;woGj7Bn%L455(waNns}QF<2G1xl@PQ{2MhG z6*(7B0tfUet0~%{t`%K3&O8}*-k-_#ex3BrqH2bkbB0Arvp#3uU}SE~tMRKat<=0? zl%GG+t>H3PNy;h=Sh*sa6xt#b?VM#87E|nrkhc03ly3O?U67ZW^O43cQ2yi!@oZ(1E&oN}ZzXoPk_y*&!k06uRD#+^gZ&Eqb&^`o0yR zmmcWX>h|sLuUWK&EAcDui7cX+d8I|XUcWRu^)n*dS-4ww^NJOw`go2HTH?G<(SVGPn?zOczl34oJrHmV1_?p}?gc zNLd;&_TNt8pEmlDK7e>23}{=(9pY{FMlY<7KJ<~ie(${wH8x9QmHFmgsD39o?;q!+ zo65&sqWlW3T<>^tT;8^KR*U-O@1qgs)RI}5i>n^Q*h~COX9cbaG z_Ero%>k=C;!ze=DL>5@h2xv}FYxQjiBaYfm2= zp=E3v?p9=q>qurF z#&Rg&^BOmPnVVa}iOw>V6}+M*Vi6bpt6lxB!C&nPgjnm_Ax={Q{^T>gCY(Ni zeq69=RjJ?{Zs%i^ibCy3SLpkMiA>b-`)_U~EXfGJ(lKlR3EAea z^X65leo^^?TwBs8LOjDOEXVGo_U6O)|ZT4FXFumdNcg{l*jcG;wPpWEZ@_6RW%KaAla=(vdTOuRwt{HPFAjbUqk zLQdRdYgFWZ8Ad+*yu6k2j0G~5`a{G%WY_J_4en+J6J?k#p)Pj|H^Vx6^e+)hH`@nC z5Y=1CkcD2!JwwxFMT9HXyma0IhGg1+d9M$ zR+d#*RZ++!MR^*YGG9T8z7jN!*lu#aql{O}*Eze4rORU`lfL2%_4C#uc4%NxS_Bfs zCBVG-&o-eA?N0J!b**CQC5k(#Kg8~&!Gyeg-lI7e=3r2v^pjqaZGCfy%t76*>LIDD zIj4j{+776SII#><7+yT&l@ubT=}5f-Zp`ScYQ%Xxk+8!=m*`CJlS7I})fc_K?-i>Iy1e^whK3E@X-Dq> z>WcP8csbKa?%@_uLM%0@^(gHR$pN7ZptU!v;H7~Wr$G-nE2OUD#EA^tino0gGrSJG zoHQwL@CP5kBf+B!+|{7iWuKjwDe>v-Xvgq8r9H$$p6z|`-`f1Ygw*cbOMR}EIg|r+ z+mnd*-&FnXK%Z3=aX{9%0WJO_jn?aX4J3kIwLW{E>7h}i-5HSVeZ7?&@8(8FPD}h* z`yG#cIpZXK0{$qs!zVWLT{ZM=)yFri%jNL4mY!oH*|Td+7txAaxAfg^PDC70?M&ML z=Gu@F*F~C@$u>8ydmA#Uu6DA^4&$jg^qu!e>Y5!~sNO(Lp%1P$f78EKRY`wZ3>Ia= z{i1EGH2^{6S(%gPa(xih{kq)_F?5&=9FXSbm9=V2`}EfsWbc^64NPj&U`IW8lDW(d z1qV`(oiH?KJOul8)ezQk$pIM;~toF#AK%ND2>k+4jFt{sSU;Vtk!p4dCUr3h*{4 z00|GM!zP8cJAa}&yFR{%M)&x>di_sNt7*SD#A+(${ztdj>^G&>n_}RZoZ$5B6-Q{v zE67njVe_8ppCoG@L&sCCR+n|Pb77sNx9YU3;U7Ph(<%-WGVved5?h*-x&=5*O`QQR zQNhW9X{f+G*#y)*x7kXS++`FoX!F=WpU3)i(FFj4&zWmkymy;zSxRWW9)edHRdIW2 z*`QR87f2$xKBgxP|FI`3%!5Yl)GBF$PZDOWX)aiz(qOh>H5;ag3kA z)QwxAOV66Gf2sgK;+28FcsfWi)ezMZq3+y=h_xwS2gR zS+@_D+NQ?vk7^;Xzf?HVw5Xov2C_BOE#dLPRxW%LZHjDNq%^vja4x^2x^ z!;wNKw^x1*Ctpz0Oh|kYy}*6^J%g=0ziJ8*=A^^aV{Tk_#B`7;9@C~;ExpLLqjE@L zO@=fi#<)xj2(3L3wiDuZufUJI?sPKt-@@}nb*&m|=b4M{cUNyl@uam9TZwP=m><={`!TeP^&WNBprB#XSsSYO!{S{>Tyx4`tZ7#SQq8%f zO0p>(ML6+7A>U(q#bpl9yN)lqdqR%@VBC~exs&d6R0(G}>|?@<#}_#V?j9;;AFqWX zoDZmH1q7EfX*srf5$I0e*v$IP!J?&lRWJnQ2WcdJ7C1*j9C4)rS$%dmfNhkX)Czm^ zR7F~d2(xd6X4@c?od47rFdN8V;KU|UxIWnxTi3&egbJ4K7jw$MJ-B(TzAbM^W5s6s zbufSmanYhc|NBkpIBdZu0l&p`DV7crD)09*quOaaGI9O$#dpW^SVx8u8(MFcc9Wsyx6wZfczg zRH>vte~eYmP7T($E25j&0_+k4_6}aMAT|UocK|4_>zug4Yxoxjuwb1M$0H+O+dcQ$ zsI%}e^`{rOFJI0UipmrOkC$WSM4sI8J$in{7MxkNX;j4o9}NcqX~el1IkV_1hmQCc zIQf80pKRXtX~8ytI__3}uX1E~D)Q9F=UP=9>}b~5qNhvx*K0P(cUqN(QXFX)ev(7ig9B-9Jw|K6vUtXGPY4Tk&nR1%z-kCV?KKz5!mb%+rJaQVf@rUwF zT(;MD_LPeE^8;xtFT#FqV`|F-k8M=vIST8`WEr`>7(azAr=4sTZEr5J;u-WWYDufB&OHF>u-Y)L(tE z)C_9^PH1LKs^YM|y|Q%_v&)W->zMskZT&<Ooqb{A=J9{?yA&TbHp@thR^$o1V22m=FGFCVY_u3mQ`S_lN>?maITx7*GD z;5(gVj50A^Wrpv~?W*cTVV>!D88MMUj8tPWjEPqTxyfj?qqtv8F&VbfsjCxlbmvBa zHAvDzN|}O`G?d0r z7O8U4eF^RA=v-J5QO1%(?*g=>RZiUZk9k4BelQGnji-gA2>|(yQjh{IdYLU^mm*JT z)>PB2L6|U5i%;Tp9a0P`~zAn z*BE8&FW6@&i?sQrvq@m3Xuj-x0)X5^CPKD5$G!v9qeKUcVKs^NzqEbY)y=;&_>?TnVfI_R z=20!h=@I8BPluL6ow*?6q9MI^oLa`?9f^FNXw|0zAFqs@I(?lNIs_}uO9PeeilBf* z;lf*v;NLoYwB|l7U-tlDyWXqyGe0R9;~Kg!h(6s?I@Zj+0$^OUo_Yg-jT%(Mq_;|` zixdFVa63fhT& zR_2syF?5Ycx=St6X8N8QewXIJo;16azX3}|q|!~wV9z}r1#*Zn=Zzy}Ne|!WZbcH& z$3h`JQH+K>I*HOqaibU$h$)hD8-DMCT%@(eheU;LKqBNQqCr#q8TPFq{4?b{L|vgQ zdzi*ciXkT-@r-!p+{~eS)$H)cGA~w!N?d8C;}sEIVlCfUNhCXNi-~l$tG>A|M3&^( z_lBpGvZRx}@@6TxJ{s>h_y$cxk5z9WlOaN@LhQLzkmkDPHztvVkV{Z0x@j_5GH{q- z8y`ge!buLMI(>sap1;#;C$DvXDXQL55s^D6^JMe%Z_9QFd1r*FCq2 z?>-;saLHUZQise&`c^f+r+x?TqA95&m_oavQ2cC}tR$=`HZ*HRn(k}1(O9-F6ERuw z^|Y0AnshHybHN(HK&HfA@?`DgtH~UKq9#SfuZ!o3DNJ`v`%L1CY>b1-HB2Rq7mLU~ zr<9l$XBn&;a~PwF6bd7YQH5S6O0R+~j-!b!+I8FY5w8q$-`FlTbV4W`*{XbnxIL&! zA|7C+JFdRzp9*{^Sf6&xSsx28E_xw{kkpnmt1{Yo=AuNhnC89z+~)?_3V%WBPH@Z| z{J_Pm z72_#mTmg9jvmRU?UoKMYkUJc!Rr(iQJyU7NVt?N}V=hwJ$a4AUi*yPyrpa8E) zX--^42_>GP9AJfgl=k+5af)`${4zw`YF9?&+b7$nE`%l44a4%rG@fYCJa+4}UW6`s zc6xT^T_wKCeN{(qO>Z;9NU!d-z-t9v1>LUxPyH|Z$J3=V;o=h#E14^q6Pfe1c9y=D zLN$do@13>YE?K^|*sN)|6K*MIk#BBld8iHeQZ3F#9_RTRnO=)`q5 zE@}JVy>Bh}kKnU1t1{a*3TG-dWj5V5BWH6yN#zJ+TS(p?YVSsTFL!er+p<}7SK$+pyX*Y@eRdu7{( z&m$i3o;scSpAG{Bm@6O@I2x;hwYqS)?;ptB9H%5d)Zw1S1qkFRVqps&P{`?Ybl zp?E}xWrm|B5!QlSH@1<2dj3y;BsNI-6X{s}>n zwbm*)QHUb&Q#>}&lSpQ?Ii5@erm<(zKNx6v;=t;vtjF%#xA|JGRQF83DZ?KeZd z$aL{q#7*K-*!!3oLC-P$k`1%e^5Dj+{(2r*o7Uct)^{L}bqZ7R0o zEtUEX)zow~)%?xs4g7EQ8PU{!{+asF8bn=QGwgkXb3xBQzk-sZ$I?38X3scEZnLc^m`IYysn%~mu9@+dJ7nS_< z!^Z)o3nZhLA9A8NMcq|1wlg#`jWZ6d9IQU*e^MMCUz_tk(ww4F*ygQB8)(2Xjg%S1B*cF8ag#qjB_deTiXOYvwVl-F5%)NT4Vz6)^KTjj`>9l-52`u$=)9Use?8LUbnedZtmYnZ zcY^UH`nn z8xIv6Cb1R0- zcs;fKr~v?^Ia+EeCce`@aKjld#V8}}d)gm-I-b80umtNR)k><-n(!KUC>>)kojR{w zo0F5Xcs;JGpxJYVYo-Psx9A(_9~Wh<=u(zi;;?R8ZNuZ`5VTY8KUE{VOO}VP<@mY! zX5v&KZjr7mb*k&gxz8c>1Z2%n5`b7YrXs3S>x`#|)!LdEAM$`ZUshx8UlIjvj5{bMk}X3DsN# zT%3^tNuM*WbFGB8XlE0i2k|!cS zfMG~T`APYI{!^mdA6&?0iby45zn10FW(Z~j!Ykx5oi@vDjAzM0DLG_diA#ql5W&g?G$+2H!6!;^pgf(n8 z-|Y;mI1<8ANKOg@3J{ctk%;kM6h8sbMbJgUXGL6<*^4;`J1G`2X829`kpF9I!rXPN z>)bz4Dg#ENiPBO2tavAorXFPo6nVEd4>`CGvA z8`!A=++~_-5$=7rrw6n&pQ2FOM?-G4x9hsV;|K3nXn_B-UzC+ql*Ko;k2V!A3?Ja? z0~)Kow?S5e@~R&wJ7fvqEOWL%%0@4FN7NQC67oN8ati3I^P*3bNs_tOIOG%GThH?Q z$BX;N97q^t{CF(i@q6;iFnplnUsS$!o-{r*{3CEXPb9qAzKF@dX;$(1|61m(V*k|a zANgL0336c_{!G`OVFl&24Mg((z;RBP4;L*nj@}6zwQL^HdsD8cULCAQ*O(0&_GfFv zIFLebV!{f1UMC4LKT#&mXVv~aFz^Wx7_= zh_^o1>K6rgE>*!w*MRMHwe^WZEMm(z858pVV8iy!U>XMgjLJwDHEZ5+Uv|U0&?Prg zbyo-GI)AJ|HqL+>BQ`BLhtVNRb^K53nKaim=L2q(pf|9!3sROj!OXkg2kSRLeM@TV zYU&-j4zi~zppVv=X;SXRTo*&7okhI6&wlIQPB{dMjksmO%@SYK=eFeG-1w+w;d!H*P zp5Af9mMkDkH^wiJ5u{oMw~8eZ!V^5zX|WU!j(ptyPmf@h|F+E#!-X@c{HNHP9wRjB9pM85)|9HYVo9B)|fPumAOg zGMB8@JZiBe`rj<<9^fzzF=RR<=PpTL^~|gPb!&j;%%i?whYP;?qn9)07~)dILlb>1 z@5N75zsRm!PfiTSq2o2zci^;BV`WJeqOx{GGG%ya7n9#M`9*%<-uR1jY;O4fCEW)W zuD2;c`{gcEP?Tk7ixJU#pnNjV_Ng{E(tr2rb7h}ts7Wz*Ulzdo+_<#<&FGMDtO2yt LZ>W{4+J*cFM*Iyl diff --git a/buildcraft_resources/mods/buildcraft/textures/blocks/block_6_6.png b/buildcraft_resources/mods/buildcraft/textures/blocks/pump_tube.png similarity index 100% rename from buildcraft_resources/mods/buildcraft/textures/blocks/block_6_6.png rename to buildcraft_resources/mods/buildcraft/textures/blocks/pump_tube.png diff --git a/buildcraft_resources/mods/buildcraft/textures/items/fuel.png b/buildcraft_resources/mods/buildcraft/textures/items/fuel.png index d97df4dc3ea03234678f0eb2dbb71b7ef58d5eec..3a170b37a2edb13d30ea859ef75b92f11a0b5385 100644 GIT binary patch literal 13744 zcmWk#1ymD%93MG)qbD(1I)*f(yGt6RRRjeFlG5GXozjwmbV-VI3eqLr4gdY$-rnxr zySKYveB%=ruBonok3)e2008in6lJxMzhD3W6@Z0_Jc?{Nm_q(wTB<0>0-pc> zbzIAO1pf7{=HV{3x#k)mhZd*p$E!KpBfx27HNNQOhl*}wl}GYA#ezj6WyhfVv9_=C z=e(B-32hiAgo@h2WR6ES7}IZ(A_A+3|0+eLG91i?VSpRg$fJx>gglfBG8gErYOL|| z0`*IhV(6Wr%jU628>GyGeXsm{3v4M2=t~*9n{AhfSukV?`#oZYAr1Xqo5B*87hqf6 zZi7ey$K!5D9!rfjjueR$ieye9>Ug_nI71a7SjzN^w0a_1l<$>}s#$0E7uWFCmVS9w z+7TW$mFY9IXr~INJ1A}yq3X-92p~fhAHZvpr|HcmS6xD2m8ntlic^2HD3S2n`u@U0nlq47n0#-=R*@4`Yw= zJ_UXfMzrq&n?Bnequ6+`Q=*}D5&h5r0Gy&U|B4?+T9Ei}J1-H^#WAHigj_=_wIy}) zw@k^^zlKRX<4v`MJVw%NEPV5c2Fdv^LK;ZqAgV7R$xH$O`xJ|d3+%cQe=+aaigM}1 zol@U>(O=~_c2?%e0TJ{;0O<^M*c-0egj5fon5{ilva|F;EHo?g=x!rcbi)vf1oNAp zJ89}K!*(yk$V7rZ7#TE%#$Z`cS+NLd&dr}h)?Yz05y2mPf*&qOoV{XWTy_Z}36_lo zF=vfJHQS!hX$N`V+bwT+x#xvp0N7K>>oJxP_8o$SHZQ)!iNE zb|i-0=V*MwX_pATv08!t?lxEr;NVs`<>7gN07L*D`{oD)Cp2u+&f_2M%8%w*1A`x08NRzUG@Cj2f|Fzd*OC{6fGQB0K;qzj6LG>1>fq&_h3( z-2`i}WZBa(NiIIAohFHertXm#6LyGhaLP@6_up3L8frfR&O%MxW~)C9?<@EPqJS(a z{b<-M5xIVXug$BxTy8~iJb%^nH=C7mNS=ZNOPmxkXlVRIWoHZcF=f$j+*f_!3GWY3 z?7ApFaB8ur!9+YlR9Vp_?snYoW*nSycDS^)NG!kuVHudw=o5ts^G#&SdtN5`q!}gt z!uNhQh6NTuIJZm!E-pbZ2Z$Z#;<^aUrwoj%wutr z$n7EP=hQW88|}a9-&kW4-Uuq1q3AxttY|uR+_MZ4EjO3M=p-H)$Dju@Or$XgI~BbI zgoJ?wqH)O(uct_40N**9{QmIqP#I8&KS{*`iK@{-H~7Zf`UNH3B`n{y*p$Fq!bgfJ znylCOZC{dXAo{woz%Y6|4^n~8(d9;ksH@PX>WN|UGl%bT{;kw-1GKKGuW5ZUvQAMa z2WTmL>E;jX!UXCo8=gP<%5BHlf>(D3yW0=6gom<}qB(OzZ0l{|<*gwhB@gfLzJ?U~3s3;%y=1WjO zU*a8Jdy!fTog@>WTm6!OZK)RV}EG%Tt< z6GnpclVV^|^ytqIxof*koxRKpRU~qGjNN(FrXdM75Dic~B=G2gAtfs)V+;Rim}vC) z*-y_d$o8M>OKKVhcAQY4T3|H`kA&FIrTfEaz8WGKYx=Uq-+it2W$>tdv;uPinV`<(0K-PGUD@pAu z#3^JFHjcNcG(xn$PQV1vOt43J{oAjRN6w#gRh$5ARGzhT!^(OBAfiT?-7!F__7Vb> z=%13UXovF;-=j;sqk+-tu00Ve>SKEatR(xv1i#xF@*)$+?E3n+yU@KS@LKEGVzj}u?uJ(!LhMWx}#Ic6qSxLmYQlidv|7|H&xYto1MFE zi&XNaT}hEynh#%u+xYmrsKj51X!mCihMwI-8B32Q5st8?5kr_2o(B_2ZdV9aMCXrJ zAyb{@2(45s^e*{$(eDU%bn9}Q{c>rAAlevMhI;MY z*@swQ_VO7yO0L(%Es9m(gBW4JN6%d{Z5$|UZWumACSEdg8cZRG06oD8SWQ8fNlxA_rzJ6$_Uhce4 zlFYDNfuu2Zo7XyOU<<*qqNPUo11n{77nNPLNw}PI$Cd>tHy|2AlO%~z$~fSVBgveC zYSRpjAX+6JyEy@t2nQ#$zQii zVK$pAa5-r9!+IFISNDjmjTnTyV<{Jgz1y2(wMgi)OzF9CDihIVj5r*3^iQIIkLh6e zpfkBkWpK0=UOCQ3-R?N@XA3-3i=!`ZCMu{o06%Xa6up(zUCIm5pwB!5$%yI#-HTRH|xvk%nf(oodFE5@s~b5TPh9*Dt78;u)# z+Z<`7Uz5T_;dx4x_&}Cf&}FLoam2fL2^49y+af<=!=0v6(0Stw&xFz!%sKE}6DcR# zK#2TPRF<}c^+uR*x=x4djAkfi4iZjjBTU51@ld&VW{Jq%ebG&#j*W49zn-XHY-|U{FJ?&)*g{bS`#X#5mu)N;U)FgqwCXL`T10g?QJ;;5$ zEj+7*u4d9>Xg9IowR+f^BjITK7m8Zt4f{00fd8F^Tjy{1yx0(${Lw1){$P+F8-ySTE3uVWit zB6=;1rytpQuoI(5j(&?1JWP>U9b10U+X$nhMcAuTS)EMft~!?tLqO6Be5Ww{4G6Ns z88ccs-(XMzYXdS&*RRMs`}T!Ge)HlD6QLjhfvr#EXDuP^mg?H?vsJz+7QYshj7bcf zv?$mx?jj`y5{FPiF7EKf5jxsL!%igrZ(l8Or8Xb3(pz{6ydNPgUtl5wphj5rCBzHh zFTw}@p*(7Eg{tcupw%b^bR+f@J(a$bzO$`DCtcvt4m(+EVUQjSRql}2G89qV+2!!a zCsbF0X79`63c(e1qL?J&UIy7P;xvy;T$78zYodS^KlyQ*(!aX{szU|)FWkqG#h}$a zE-H_ixXBW6-MV$WF~<=V^gYd@?c8=)F9SA^fh0g<3F6TttBid~`PEKbJ54ccbVt^oXL~XT z4i|tXccIFMbYS@E1Hd+-v|Mul_Ij*}7-g8g=K83wOe}PAvgk6kiDg{LZGH^oIlnEC zZ!Sx#{NhMV@%sm=3Q>ejd&BUfU%~YC4)DvSD18vgK-lnPyRAI!#3uS|OJNoxSD*vM zbzqvf0|qE%GDy!$42s@w&r0Y)ZX409@r*f^h#oJ?!|Fi-VE-vcC3+D~A0#U&;+naK z>^sdKF=@i`HXyw%{ULAK`{Fl&Jtj#^dP{b{0HqIP`*nRS|CoKnKZBMD$k8$HL_HB68d$t%*8U-W=CFlU5-r<68xjszJb*ta}NZq zfV8@-Mg?zj3U()1*+*V zZ5DQbaV7X0DE#;@Wi^W~U03Yzhp%9jg6|_x*~=z{A0uOE7?9(CN8^~dA`+6A(Ldoe z+r!7%b!#?8?dSvE5!TZU&gf?PK*8q}Knw>zUk<@5?+#i?rA+QdbV0Z36QM|POuR&lT{jVB83^))h( zthD670D&wrsIs#yj`*EKXKA{oDujr{V+i#~TMD|Ai+IIb$0Xdf=XP_%ySr}{kbqK^ zN`@Hl*~#Ao3!}5^;vdl2X-(OJ8^yLt?oVn*LiA|{aMC%!TBicIT2Z27U5#i2ozTYd zNTiz&9@q?A7U&Lpf7HtR<)BqAb|k1rYD5OZAD-lY$Hiqb5b32VvrslLFo9ow(C?L{v`D1pE>qf*8DEXnexhhfPKQn^ z#G14_o?;9Bq!ut@pndwH?&fh%9c?M;Z`@xXIpXfeCufhBAtbM8voNw%^lN|se|(1W z`dDovNekH>*_ECU08K{b^^oO~~ z43O9T7$^(>V1&emuP~QSt*DUw>1Wfza4Xrq<*FYCZeFqKcOxD2s|R?v#d#0teMUgj zCa71LOIRH0b%0Q#zXCCCQwXx{rzfl9`6t;>&aw1wA48ZsKvQkwj^jgYFh>;7Ji+tl z@+dxTHqb~E2O>G(&VvLPNI-6skz6xNI-|`kOITWMaklixmD%*cYLml8GwBT6@63Q1~Y~-NS>KiNL@$KeS7|4aR{&)VQ@VYb6~pkCR~)x+Y7c`NOnItSi0j@mM|P~|L|8+R~R z;f2Be2aDh26joH1UmGhd6VU@XdTA+W+4Q|ZMoKY3Eg@yIF${|{P#&g5#M+PT?U}cp zVe!ZrL^*sqwUySxD=c3U@O|uG^LIJh!j<8I=UsXF6Tb+I-WyNn7m?>AAB}-p&{x5} zapf_3AWS&HGsXBd(beU36lN{)2)o9VHo9=odDeJJDltxxtu~QBfFHs+$?kYJ2bkb zVpysT*1J>|gTe6`emoFn8Mlw0RWTr;lzn|$pBq-iW`AaEpC(ZwKEi!mHb>Lu?!UJQ zD6ErhZSFsu^X+36H|Vb*pB{Rpss=nq-u}1v>UWOXqtn%W3CmeNF7}m)QmNY6)kD!= z4VcJ+$2zQSXQ2d5^stWC!#JByu*VYTp`PZ&eLrM%WNc?jV(IGJY|`S2y>D>e5Nr1} zdK1V{9UZ-wf6K)bs?H@yoz#sR1Hcv^;i|hCYM2 zIaJwd^tf3TB+SadoE2qwoP9aFdfn^z`7od~stn0fty8c^V}>Q6lFcj+AKYklMyw_l)5W_>b$tb$oJ3hgLWH-yFp|rGK|=_+h1}tMinx zx#(^cO-n1kp=qOiaD3@93>u}M$X!}(Y!vllTfELtW)}h9M;v-xo=-8 zd2UT58=vmXMmO4>zF%NN=?C6hFV7+ii9IH zU2hCqf)czc*&@JDF+}#0dsz1Za7o!>SX)OMN4EaOC*fiwlnzXMm$u#XX=(S8G8EV$ zaD0DajyU_Z*8PCft5yl|_m6#C-*t#9`;a$uR|(xxc} z_iUaP--|i6m$0?aM>VL&zdeEeB6dA%IuOdYhd^2N%%AmeZ+}%EBlbl!^qaXmRibjHrSm@YNwwO9=XTlZ-mIQSD~!UB=oVaZ??e) zL6am(Qx`J+$|sU`rO17J68lU^b7suU34Vd1_H~{aRfr4=qq+d=-yU&My~^euWFi$e z>6Y^-EN_8Qh8<(va_t1k*F{;4@8qtrbbfaBTKN*G(cks!?W0F+zxh^i5K4BI`Pl{b zRRzvlr|5O0_MzLjm0?&X`HP>urYwc~ zkBT8ls9z9hcQnt$E1rk`J{_it3ftrPjiL;)SZ&ZoGo_5%rS z33Fj|SpAA|BUWO3$`mUZ>JByR=A+!Nfl7oH^0V4XJPW z4m34HvhNd0oWP22iahf0QibKE7_7|OO)U3+$HfpT5Ej(A9MSi1)6iI%g=+o}o*U#% zucL9o5^dX) zQ&?{Il|04g!;-yQE0_K}F$uSYw3WWa?!dogxB>lYz1qX~hnep(Y252;dhT4gK1|G7 zN2u{vzOGe5eY|}qR7Z9l1w2j_tnMKMCuGa@ckw`7WU&gc`jYQHiu9k1`2N2-lrPuK zIbV|q!wo!o30xi^8|wsBvt16pp&IlICsS16ls~Dj$xA}RMue!~|bgmAFhEEhCPga_Qstk3dNDJvo6Q47;B#K7)g zD30o9Z7)&{`e@OmB^CudMC>)BqYj?`2ozcaTc6lsT%fv#Eot&SJg!+1u*SgBsLbs} z43J#d6iM&x66uQQC-eXysQgb$NVe&^o*h?5stSp3fCLr<R_-L>4m2susv&W#5cNo8wp@;ratrb z;|OK#CUOgB3}Mv*EwW4Byd*vtsI9+>>v?V697C|7U`yd*8$sxxLj=EB2MY0FULz;& z<^OSGV6qXDx=`$6yQrZ;aeR*9gy(rl6w4(}H+BWPJIi&{TKYji<69qX1wK`*#uH5& zLhr3}c`RCaBA`La7a=O$T+k%;ZO|l4ehX*6?x6TpRdaLgsLGkXZ+IeH;s51FZlkuF zO}%%=`pU2hrW3lb|) zKPCoOg-yINqRVN11A|^@Rk&@(GlkR7@vbY(s-Y#8Kp=r$4u4@OF=o2?NU__Gw3l-1 zx0F(9;gD~_I|`9cUbXA9=cxjhw&&Qa*>_H1Y0CwF3YN{ zURS*t2=8T>Z+R8lK)P3naR5+34Q<5z#K#BO!7HsNo$_KaFj6LhVt-4l%l`{rC!i#g zFcL5s@7oCbAoBSNo!%vy9vw;Cy(40uUpo`E)DRKxmm;AnWz$C+>e@x@b;R>~75d(C zQ$gE2!-tT(ERNB!_bu+j(V-|uU-ehpd*P4{;GuDr6UU*a_$e|)ee+J+_SE#C@9+4u z?Uami&xoP6QR$sD#?HRwQ?Gv(cT7EZ|5BNuH~0IykGvWE3u4OGu`|7-=Ro2GTsePy zrRQn4JUYY&PphT4G#-!syv)(KkvZA;-asV1{!hw5qJh4`Cj2K_-}={?>d(LXkyDK0 z)O7gj>Njg(+qO3|gWWItpguI}m1_lSx$Ms${bNvr`Y*!p03ipDXvErEGr03=BC=vE zqbhb2;^6CBh3m~11UceA({_aCDlJTIi3OB}z1O)23T!7jd;&-Jyna2>u;tyEC#L`Y z7~v8XgsKpH<%y2LpKfl}F|qg;x8#o=qIqsq5hrL-9?9;&&A4iPE{T9&kDXq%x`gljU3u1jSg8m7W=~jF z7WI9+ugtRBVnI9#+FngbJUO&oUA0XQw2M#B$gEGmC$8wnYU#~l4?S3~D5z>h$&WPFe+kUj{U<|+b9Xmz!XqgYKd%|nqqx<3U0AAEs=IQs3X#t#;SrDa8c`an0)fK z?4wbdw4nd0A2UqU_^T3`cRL0esJLDXorXc=bhi|@;clOzR}^q@o|L9iLU$_PpX2;x zIpm_AZzV;HntxnzIN*GvDA{|zEv|5pu4XQpVA*8#A?3?(=U1;r;*Vn90SEsZ7?Qho zK%TgaQpOI~7;2H_B0ske@KjK=a@=q;OPb(F+l8*$zU#{7Dhf306|fGEVJwPp3B}IC zadyq0`30@`4rA0axkQ&0;F@`?=6UOz<9CDRsXv*?>MtSnT%;XU`cyJB67mAAveh!< zKbeG|zc#Wt z>#Vw&v*A>gF(d%Uox|Yuh^c?hURfEuaL@gWZIf_f7h|)Q6XL6m|F;&Aa+~H2Gt&a zx9|5z=Dn_VH{z9wZS)&@1~R|x`*M%6B}g>d>82oN{wj*=<#3jP{YN|zW>nJDFE0x8 z|F%UK=njH#)6$4*2n&8MP}UNyqP*C-lUH}IVug272J0F~5hq zx$OX5{foaTZF2B~9nh`JN$cGPui|&X{)^6Oc`|}GU3Y2-Ixc2 zI7i&OV-md#056SP^9Lkw{7qTz_K^_IWAgsHw1@)Xd(W^_B*h2tLfY~4l-O!|U z3|7^l$yTx&vF$#A=?)@H*Cfa)*6wDW(bA6&8gHWCzAAr(6zl)jf%wKIvfwgzqfO1j z4yLpPUo{+Snq41$ytAEI@M31d04FgWq&^3o3x#Bu(v!D$&e9_NASO5NUEwLJi@=A~lxfXO)UUY2IJ<#8d2YR>fs&zV;8;T_UQb}MscV*PAp2H7nfBv*1; z+lyB0cT4&yJeDQ7m{KD})upz})U>ePRn()Jgx0;wB;uSXdBW=1H0(v=J2Xh$m29|Z z^D0WS^lhSho=obM?#!%uR@tdvpNWH8j8e;e2kPLWxL%k<1f4|*yd!U};P8t0?yIvz zpRH3;z~mbv1?bux64beWC|P@Yc-!>xB^!7{xY|W+|0H)=u*en9VRJOK{q#Lqkhp9}nj3nIeUVfZvF<^Py@RyXmN*l|4 z-z_08!nZ&u1JvjDiMPAPcASX;ui}ynDQOo?bWJFb=f)9x4G>lM3s_dy88m|>>VHeh zzkOshs=c;menS%gM6059)*>lwTgpqd#D$)4T;vH_lPlRw6`Z`&_q_Hm5q#Aoj+a29 zB`tD&{zXbc$x>~n&S0wclBrcBh237Ujqu*z_NX<|z59ChLP=R$b3*bVS&UaZw0eqI z?&ygQ#<9b&n)R z`>!|K*~L@IB@l09aY|;Ionq}rLP!tYd;!dq8-jw8u4=HZGI3>n7Fu)um?~Oi7$rC!-$q<5VwB?@vOff6i465opMuGew4e-*82+JZe zI%67(es7Lv50`yiRr@yBFGD@PUuKsD!4=Z(yKZ?(E1?NrX+T-JNDC4l0wwe*afB@| zbB?{-Wpv6^q#A0@37U;5-M(k}P!h)7o6ow|eQ-VOs@&E*qTpToPo46__{zUB zuLpOs|HM^3BaJQp?$(lQ6{hd0T-NI!@(d@OoI2V=RI%|%&Pr-|3##~~)ukO4vb4kJ zb$T+3JObZ@&Rl++jE3)OS8INQ`D=)7w)CqWIDWp;?PLTN}XVj578pmqM`j@y@{>M$W_?D1$s7%s|h}!JF zpz*CKi3N{XpHB*1K_qS{@Sy8^d{Dh@mety)c3SU#DCnjq#6RgtZjEuqM^K?Ou0S%m zB<%Jds}-lwX^5!`_2#n7G`Fvz<>Q}~H7lyX6hVW_71bEj9~;pY?Udq++4tnu3r0sb zVNeUE3R>gFs`8H&dA24>ET7S8Mz=HMDUkHdCQg~bW+Dgc-Xsk3C-tnyQIukAY%LA` zQrr2hLPsv^p8-eLaO3zF>|4C^1zkq3i|Rfb=9W%QU$PEC(th$E%`d#Mx&MR+d9ME2 zb&E=C34i}D!_?N5+L#=7$vf6oagb<#*14lGAs+$)d7gQYgWzZ1zb!@)j=Juc8(v*s zulf6GM1rr6d|u*?ptmcAiu~}=jM@*zA%(9F$*?m<)wi6tkbikC2;X6#re1&DX~DZP z3O`!!4xAh)c9!Wzv$Ke$X)Tl9L%+O}CF|6oYF(vYZ)EJ249#Qo7r*zjJMu(dYIwhQ zGj9lpT-W-9PDGH;v25%h-YkHkLwC1Jn6O6z%gz;jr|u+{x=*&hxZJuCX^PK&JwnRU zxp-Fv5<+e4pcsGm9Z7N_WirmA8fAIN*-b(%SvDR(Y!G;Z6{%LosZxn_i*v-}d%P}8 zHHs@j`1q`@NgeO9%1HH`oZTBv1)dV)GFUSxtmyr-{vQA77H+VeN_y*xw=}BLmStfo z6G>P*7~|2QHE?>>@qO(Atgu6~EN0@}=ftGOc_#}3Aq2{(AsdsM_vf+IVTwe%Lns6r z^P{bispWzzif}QDqKIT+GPAYS4XIqeS4P1m++e#G#w*3uot3@cNYi9UIzMjN34C|& zB25nk-l&t;?BDjQN3}KfONzk#cXqiDI+rdH*sV9NUu*+4^HbJ*rV{I(@)GUok9IHA z7Wpt{8i|{*g^LZ8w{LnsUe}*<3C53TNujs7$FR<2RLQUfSXY?mM{K7M_R#_W1^%t# z8<`HLS}gS~uD9I=p8~CQ&O~kXMn={}oSLrVpkh5~TwGaFomtpbFzat?G0Eo$37rwV zZ>&d}zqzvag*~7f)QMwu-=1gxbWuz6JGDzy$?PsLeY$-p{Tnsix*6;KX^7`nw^73m zjT7-e-sIIgCR%ApqG~w-upCy!hl)57@v7?V6%Ikifa6}YpZ32qG&1KYF0NB~$05Is zjLOo{L14M|xNkJ|aZz&e$uTh|ov;X={~g&#wT@b>=V{N2BLcNi=;%GZsqQ?MyXQG> z0PvGZIw$L=G>OQP(6pD~y@4&R+9-eD^RAT2ZRC_3iKi3~U^hf!d~!Pv{JY%X6qvt0 zt3CHcA`xhaN}ErkXBkp7niPwYu%G&>yYL>;bNPE4E`$^Gt+$Xl98@CarBQjitV74twKVPTnlPKmf zM;>8GRiqh#0gZZcV%xIyPiU%YQ8qx+3i1*-Hdw65nt8=*I!rb zZse#uTmNnBn|-yfOEU0S6ciVArg7RwH|DUMlVx5YBlz0;6k7$!`X$^`?l?oyYt*^u zO`o1pKJJ9ptzI{@e^Wa`q&y&BzsNFMi@_(s^F2aA!ym#}Gz{`bd zAN_sE(=k<6{C<_HqCNesFfn5+yG`C~J7HoUVPR3=5X-dN_nS}(fxi?;xAfclFyA}D z8&x4W=Gy5${vLn*CpH0PjXd=#B$Em(`lV-7m-~V@eXO0Y4l>o_>v$pkdF{(wtWFL7}5{od5W579TbOD`-T&ZdRsfSkGziI8wj21nsl?Zqs+M*EZV&H<7iegQu2Le^C1t9()IRO!Bv9J+Zjr9TH@{9ntHtG1C`WHov11UjiYV)!EYUm}T$d zL~NoX!NB%2WRsH3m`G|9{+72puHzw@k|I^&oSodmbvfcdtfgi91+&`{HS7LL3}b-a zkEW5&SoeH^`UmyZ!x`6f>4Ic!T!n8#>QtKAi;X^_Bsn&%feUoI)X95~>O zQv~wKal|x!;dgj>{R4saZSA&Go-yU1IOrL8N$=?W^uyW)`EC_JNlsn1TG~9|KNn~Q AXaE2J literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;OS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5lwb?+ z32{AgfG?kcAvOLRP=hkfv%BBh>@X{fvJ^&iLQZ( zm4SiVv+p%18glbfGSez?YcSvKe*maK5M)DIW=?8eVs5Hc36Q~H9B;78nZFV!$>8bg K=d#Wzp$PykcTR-> diff --git a/buildcraft_resources/mods/buildcraft/textures/items/fuel.txt b/buildcraft_resources/mods/buildcraft/textures/items/fuel.txt new file mode 100644 index 00000000..d8fe765a --- /dev/null +++ b/buildcraft_resources/mods/buildcraft/textures/items/fuel.txt @@ -0,0 +1,32 @@ +0*2 +1*2 +2*2 +3*2 +4*2 +5*2 +6*2 +7*2 +8*2 +9*2 +10*2 +11*2 +12*2 +13*2 +14*2 +15*2 +16*2 +17*2 +18*2 +19*2 +20*2 +21*2 +22*2 +23*2 +24*2 +25*2 +26*2 +27*2 +28*2 +29*2 +30*2 +31*2 diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 340da1ee..6dff79bf 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -11,13 +11,18 @@ package buildcraft; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.Property; +import net.minecraftforge.event.ForgeSubscribe; import buildcraft.core.DefaultProps; import buildcraft.core.Version; import buildcraft.core.proxy.CoreProxy; @@ -35,6 +40,7 @@ import buildcraft.factory.BptBlockFrame; import buildcraft.factory.BptBlockRefinery; import buildcraft.factory.BptBlockTank; import buildcraft.factory.FactoryProxy; +import buildcraft.factory.FactoryProxyClient; import buildcraft.factory.GuiHandler; import buildcraft.factory.TileAutoWorkbench; import buildcraft.factory.TileHopper; @@ -57,6 +63,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Mod(name = "BuildCraft Factory", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Factory", dependencies = DefaultProps.DEPENDENCY_CORE) @NetworkMod(channels = { DefaultProps.NET_CHANNEL_NAME }, packetHandler = PacketHandlerFactory.class, clientSideRequired = true, serverSideRequired = true) @@ -208,6 +216,8 @@ public class BuildCraftFactory { { BuildCraftCore.mainConfiguration.save(); } + + MinecraftForge.EVENT_BUS.register(this); } public static void loadRecipes() { @@ -251,4 +261,16 @@ public class BuildCraftFactory { } } + + + @ForgeSubscribe + @SideOnly(Side.CLIENT) + public void loadTextures(TextureStitchEvent.Pre evt) { + if (evt.map == Minecraft.getMinecraft().renderEngine.textureMapBlocks) { + TextureMap terrainTextures = evt.map; + FactoryProxyClient.pumpTexture = terrainTextures.registerIcon("buildcraft:pump_tube"); + FactoryProxyClient.drillTexture = terrainTextures.registerIcon("buildcraft:blockDrillTexture"); + FactoryProxyClient.drillHeadTexture = terrainTextures.registerIcon("buildcraft:blockDrillHeadTexture"); + } + } } diff --git a/common/buildcraft/api/blueprints/BptBlock.java b/common/buildcraft/api/blueprints/BptBlock.java index 3d160531..3e281012 100644 --- a/common/buildcraft/api/blueprints/BptBlock.java +++ b/common/buildcraft/api/blueprints/BptBlock.java @@ -133,8 +133,8 @@ public class BptBlock { */ public void buildBlock(BptSlotInfo slot, IBptContext context) { // Meta needs to be specified twice, depending on the block behavior - context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,1); - context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,1); + context.world().setBlock(slot.x, slot.y, slot.z, slot.blockId, slot.meta,3); + context.world().setBlockMetadataWithNotify(slot.x, slot.y, slot.z, slot.meta,3); if (Block.blocksList[slot.blockId] instanceof BlockContainer) { TileEntity tile = context.world().getBlockTileEntity(slot.x, slot.y, slot.z); diff --git a/common/buildcraft/core/EntityRobot.java b/common/buildcraft/core/EntityRobot.java index f33845b0..7208b853 100644 --- a/common/buildcraft/core/EntityRobot.java +++ b/common/buildcraft/core/EntityRobot.java @@ -207,6 +207,7 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData { if (a.slot != null) { BptSlot target = a.slot; + System.out.printf("RobotChanging %d %d %d %s\n",target.x, target.y, target.z, target.mode); if (wait <= 0 && BlockUtil.canChangeBlock(worldObj, target.x, target.y, target.z)) { if (!CoreProxy.proxy.isRenderWorld(worldObj)) { @@ -214,13 +215,13 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData { if (target.mode == Mode.ClearIfInvalid) { if (!target.isValid(a.context)) { - worldObj.setBlock(target.x, target.y, target.z, 0, 0,1); + worldObj.setBlock(target.x, target.y, target.z, 0, 0,3); } } else if (target.stackToUse != null) { worldObj.setBlock(target.x, target.y, target.z, 0); - throw new RuntimeErrorException(null, "NOT IMPLEMENTED"); + throw new RuntimeException("NOT IMPLEMENTED"); // target.stackToUse.getItem().onItemUse(target.stackToUse, // CoreProxy.getBuildCraftPlayer(worldObj), worldObj, target.x, target.y - 1, // target.z, 1); diff --git a/common/buildcraft/core/render/RenderingEntityBlocks.java b/common/buildcraft/core/render/RenderingEntityBlocks.java index 943817d8..a44bf9d3 100644 --- a/common/buildcraft/core/render/RenderingEntityBlocks.java +++ b/common/buildcraft/core/render/RenderingEntityBlocks.java @@ -3,6 +3,7 @@ package buildcraft.core.render; import java.util.HashMap; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; @@ -96,7 +97,7 @@ public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler { // renderblocks.renderStandardBlock(block, i, j, k); } else if (block.getRenderType() == BuildCraftCore.legacyPipeModel) { - + Minecraft.getMinecraft().renderEngine.bindTexture("/terrain.png"); legacyPipeRender(renderer, world, x, y, z, block, modelId); } @@ -114,7 +115,7 @@ public class RenderingEntityBlocks implements ISimpleBlockRenderingHandler { return BuildCraftCore.blockByEntityModel; } - /* LEGACY PIPE RENDERING */ + /* LEGACY PIPE RENDERING and quarry frames! */ private void legacyPipeRender(RenderBlocks renderblocks, IBlockAccess iblockaccess, int i, int j, int k, Block block, int l) { float minSize = Utils.pipeMinPos; float maxSize = Utils.pipeMaxPos; diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index d7dfcca7..911a4b95 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -104,7 +104,7 @@ public class BlockFrame extends Block implements IFramePipeConnection { public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int i, int j, int k) { return getCollisionBoundingBoxFromPool(world, i, j, k); } - + @SuppressWarnings("rawtypes") @Override public void addCollisionBoxesToList(World world, int i, int j, int k, AxisAlignedBB axisalignedbb, List arraylist, Entity par7Entity) { @@ -196,6 +196,6 @@ public class BlockFrame extends Block implements IFramePipeConnection { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - par1IconRegister.registerIcon("buildcraft:blockFrame"); + blockIcon = par1IconRegister.registerIcon("buildcraft:blockFrame"); } } diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index d580920b..1a251dcf 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -44,9 +44,9 @@ public class BlockPump extends BlockContainer { public Icon getBlockTextureFromSideAndMetadata(int i, int j) { switch (i) { case 0: - return textureTop; - case 1: return textureBottom; + case 1: + return textureTop; default: return textureSide; } diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index faae3588..6abada33 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -20,9 +20,9 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; public class FactoryProxyClient extends FactoryProxy { - private Icon pumpTexture; - private Icon drillTexture; - private Icon drillHeadTexture; + public static Icon pumpTexture; + public static Icon drillTexture; + public static Icon drillHeadTexture; @Override public void initializeTileEntities() { @@ -41,10 +41,6 @@ public class FactoryProxyClient extends FactoryProxy { @Override public void initializeEntityRenders() { RenderingRegistry.registerEntityRenderingHandler(EntityMechanicalArm.class, new RenderVoid()); - TextureMap terrainTextures = Minecraft.getMinecraft().renderEngine.textureMapItems; - pumpTexture = terrainTextures.registerIcon("buildcraft:blockPumpTubeTexture"); - drillTexture = terrainTextures.registerIcon("buildcraft:blockDrillTexture"); - drillHeadTexture = terrainTextures.registerIcon("buildcraft:blockDrillHeadTexture"); } @Override From 99bae591d565f9db88fc21c567254b200421e894 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 29 Mar 2013 22:59:04 -0400 Subject: [PATCH 80/93] Revert experimental pipe flow changes --- .../transport/PipeTransportLiquids.java | 18 +++++++-------- .../transport/pipes/PipeLiquidsEmerald.java | 2 +- .../transport/pipes/PipeLiquidsWood.java | 23 ++++++++----------- .../transport/pipes/PipeLogicWood.java | 2 +- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/common/buildcraft/transport/PipeTransportLiquids.java b/common/buildcraft/transport/PipeTransportLiquids.java index 48036594..64e7f9e6 100644 --- a/common/buildcraft/transport/PipeTransportLiquids.java +++ b/common/buildcraft/transport/PipeTransportLiquids.java @@ -36,7 +36,7 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine private short currentTime = 0; // Tracks how much of the liquid is inbound in timeslots - private int[] incomming = new int[travelDelay]; + private short[] incomming = new short[travelDelay]; // Tracks how much is currently available (has spent it's inbound delaytime) @@ -88,24 +88,24 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine public void reset() { this.setLiquid(null); - incomming = new int[travelDelay]; + incomming = new short[travelDelay]; } public int getAvailable() { int all = this.getLiquid() != null ? this.getLiquid().amount : 0; - for (int slot : incomming) { + for (short slot : incomming) { all -= slot; } return all; } public LiquidTank readFromNBT(NBTTagCompound compoundTag) { - super.readFromNBT(compoundTag); this.setCapacity(compoundTag.getInteger("capacity")); for (int i = 0; i < travelDelay; ++i) { incomming[i] = compoundTag.getShort("in[" + i + "]"); } + setLiquid(LiquidStack.loadLiquidStackFromNBT(compoundTag)); return this; } @@ -116,7 +116,9 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine incomming[i] = subTag.getShort("in[" + i + "]"); } - super.writeToNBT(subTag); + if (this.getLiquid() != null) { + this.getLiquid().writeToNBT(subTag); + } return subTag; } } @@ -138,7 +140,7 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine public byte initClient = 0; public short travelDelay = 12; - public int flowRate = 10; + public short flowRate = 10; public LiquidStack[] renderCache = new LiquidStack[orientations.length]; private final PipeSection[] internalTanks = new PipeSection[orientations.length]; @@ -550,8 +552,4 @@ public class PipeTransportLiquids extends PipeTransport implements ITankContaine // TODO Auto-generated method stub return null; } - - public void forceSize(ForgeDirection dir, int maxCapacity) { - internalTanks[dir.ordinal()].setCapacity(maxCapacity); - } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java index d215be4f..6b8e1726 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsEmerald.java @@ -23,7 +23,7 @@ public class PipeLiquidsEmerald extends PipeLiquidsWood { standardIconIndex = PipeIconProvider.PipeLiquidsEmerald_Standard; solidIconIndex = PipeIconProvider.PipeAllEmerald_Solid; - ((PipeTransportLiquids) transport).flowRate = Short.MAX_VALUE - 1; + ((PipeTransportLiquids) transport).flowRate = 40; ((PipeTransportLiquids) transport).travelDelay = 4; } } diff --git a/common/buildcraft/transport/pipes/PipeLiquidsWood.java b/common/buildcraft/transport/pipes/PipeLiquidsWood.java index d4e1ada1..c670f551 100644 --- a/common/buildcraft/transport/pipes/PipeLiquidsWood.java +++ b/common/buildcraft/transport/pipes/PipeLiquidsWood.java @@ -45,15 +45,13 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { public PipeLiquidsWood(int itemID) { this(new PipeLogicWood(), itemID); } - + protected PipeLiquidsWood(PipeLogic logic, int itemID) { super(new PipeTransportLiquids(), logic, itemID); powerProvider = PowerFramework.currentFramework.createPowerProvider(); - powerProvider.configure(50, 1, 64, 1, 250); - powerProvider.configurePowerPerdition(64, 1); - ((PipeTransportLiquids) transport).flowRate = 1000; - ((PipeTransportLiquids) transport).travelDelay = 2; + powerProvider.configure(50, 1, 100, 1, 250); + powerProvider.configurePowerPerdition(1, 1); } /** @@ -61,7 +59,7 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { */ @Override public void doWork() { - if (powerProvider.getEnergyStored() <= 0 || liquidToExtract > LiquidContainerRegistry.BUCKET_VOLUME * 4.0f) + if (powerProvider.getEnergyStored() <= 0) return; World w = worldObj; @@ -79,10 +77,9 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { if (!PipeManager.canExtractLiquids(this, w, (int) pos.x, (int) pos.y, (int) pos.z)) return; - double p = powerProvider.useEnergy(1, 64, true); - double d = ( Math.log(p)/Math.log(2) + 1 ) * LiquidContainerRegistry.BUCKET_VOLUME / 7.0f; - System.out.printf("Extracting %f %f %f\n",p,d,( Math.log(p)/Math.log(2) + 1 )); - liquidToExtract = (int)Math.floor(d); + if (liquidToExtract <= LiquidContainerRegistry.BUCKET_VOLUME) { + liquidToExtract += powerProvider.useEnergy(1, 1, true) * LiquidContainerRegistry.BUCKET_VOLUME; + } } } @@ -111,15 +108,15 @@ public class PipeLiquidsWood extends Pipe implements IPowerReceptor { if (tile instanceof ITankContainer) { ITankContainer container = (ITankContainer) tile; - LiquidStack extracted = container.drain(pos.orientation.getOpposite(), liquidToExtract, false); + int flowRate = ((PipeTransportLiquids) transport).flowRate; + + LiquidStack extracted = container.drain(pos.orientation.getOpposite(), liquidToExtract > flowRate ? flowRate : liquidToExtract, false); int inserted = 0; if (extracted != null) { - System.out.printf("Can extract %d of %d\n", extracted.amount, extracted.itemID); inserted = ((PipeTransportLiquids) transport).fill(pos.orientation, extracted, true); container.drain(pos.orientation.getOpposite(), inserted, true); - System.out.printf("Did extract %d of %d\n", inserted, extracted.itemID); } liquidToExtract -= inserted; diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index 10dc9af0..19bb1f16 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -43,7 +43,7 @@ public class PipeLogicWood extends PipeLogic { } if (newMeta != meta) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta,3); + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta,0); container.scheduleRenderUpdate(); // worldObj.markBlockNeedsUpdate(xCoord, yCoord, zCoord); } From e84f6cf79088a4589123557ada1a1314d272afe1 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 30 Mar 2013 22:06:11 +0100 Subject: [PATCH 81/93] Removed debug output --- common/buildcraft/core/EntityRobot.java | 4 +--- common/buildcraft/core/gui/GuiAdvancedInterface.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/buildcraft/core/EntityRobot.java b/common/buildcraft/core/EntityRobot.java index 7208b853..0d291710 100644 --- a/common/buildcraft/core/EntityRobot.java +++ b/common/buildcraft/core/EntityRobot.java @@ -13,8 +13,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import javax.management.RuntimeErrorException; - import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -207,7 +205,7 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData { if (a.slot != null) { BptSlot target = a.slot; - System.out.printf("RobotChanging %d %d %d %s\n",target.x, target.y, target.z, target.mode); + //System.out.printf("RobotChanging %d %d %d %s\n",target.x, target.y, target.z, target.mode); if (wait <= 0 && BlockUtil.canChangeBlock(worldObj, target.x, target.y, target.z)) { if (!CoreProxy.proxy.isRenderWorld(worldObj)) { diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index 8c7df136..5f69c49a 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -46,7 +46,7 @@ public abstract class GuiAdvancedInterface extends GuiBuildCraft { drawStack(getItemStack()); } else if (getTexture() != null) { mc.renderEngine.bindTexture("/gui/items.png"); - System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getTexture().getIconName(), getTexture().getOriginX(),getTexture().getOriginY(),cornerX + x, cornerY + y); + //System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getTexture().getIconName(), getTexture().getOriginX(),getTexture().getOriginY(),cornerX + x, cornerY + y); drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getTexture(), 16, 16); } From 7e0db04005e2c61bebd831d54b5b5a11f3912e3f Mon Sep 17 00:00:00 2001 From: Krapht Date: Sat, 30 Mar 2013 22:49:40 +0100 Subject: [PATCH 82/93] Fixed up build.config Updated forge version buildscript will now use a git describe to get a version --- build.xml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 518d158d..af8af5d9 100644 --- a/build.xml +++ b/build.xml @@ -18,12 +18,13 @@ - - + + + @@ -44,7 +45,7 @@ - + @@ -57,6 +58,21 @@ + + + + + + + + + + + + + + + From 2574acf9a0e3882ddc9937be9a5a798c8308e5cd Mon Sep 17 00:00:00 2001 From: Krapht Date: Sun, 31 Mar 2013 16:43:55 +0200 Subject: [PATCH 83/93] Update forge version in build.xml. Closes #710 --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index af8af5d9..ad584de8 100644 --- a/build.xml +++ b/build.xml @@ -18,7 +18,7 @@ - + From 8401fc600cf540b9ebdc3c478fca14ad57bd49ec Mon Sep 17 00:00:00 2001 From: Krapht Date: Sun, 31 Mar 2013 19:18:44 +0200 Subject: [PATCH 84/93] Make idle TileLasers more cpu friendly. Closes #617 *Will only search for work every 5s (up from 0.5s) *Will bleed 0.1MJ / tick while searching, so unless it gets additional power it will eventually fully stop searching --- common/buildcraft/silicon/TileLaser.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index d46e8036..ec187744 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -38,7 +38,7 @@ public class TileLaser extends TileBuildCraft implements IPowerReceptor { private int nextNetworkUpdate = 3; private int nextLaserUpdate = 10; - private int nextLaserSearch = 10; + private int nextLaserSearch = 100; public TileLaser() { powerProvider = PowerFramework.currentFramework.createPowerProvider(); @@ -65,7 +65,10 @@ public class TileLaser extends TileBuildCraft implements IPowerReceptor { // If we still don't have a valid table or the existing has // become invalid, we disable the laser and do nothing. + // Also bleed some energy from the provider which will result that a + // laser will eventually run out of power and stop searching if (!isValidTable()) { + powerProvider.useEnergy(0F, 0.1F, true); removeLaser(); return; } @@ -109,7 +112,7 @@ public class TileLaser extends TileBuildCraft implements IPowerReceptor { } protected void findTable() { - + System.out.println("SEARCH"); int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); int minX = xCoord - 5; From 8cb7ff17a00a91ed723586beef354903012499b8 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sun, 31 Mar 2013 19:23:08 +0200 Subject: [PATCH 85/93] Remove debug output --- common/buildcraft/silicon/TileLaser.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index ec187744..ae124029 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -112,7 +112,6 @@ public class TileLaser extends TileBuildCraft implements IPowerReceptor { } protected void findTable() { - System.out.println("SEARCH"); int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); int minX = xCoord - 5; From 2095731772772c049c27dd5c3f520d9f62afa192 Mon Sep 17 00:00:00 2001 From: Krapht Date: Sun, 31 Mar 2013 19:34:05 +0200 Subject: [PATCH 86/93] Clarified javadocs Closes #609 --- common/buildcraft/api/inventory/ISpecialInventory.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/buildcraft/api/inventory/ISpecialInventory.java b/common/buildcraft/api/inventory/ISpecialInventory.java index 5b52e360..27b735d4 100644 --- a/common/buildcraft/api/inventory/ISpecialInventory.java +++ b/common/buildcraft/api/inventory/ISpecialInventory.java @@ -12,7 +12,7 @@ public interface ISpecialInventory extends IInventory { * @param stack * ItemStack offered for addition. Do not manipulate this! * @param doAdd - * If false no actual addition should take place. + * If false no actual addition should take place. Implementors should simulate. * @param from * Orientation the ItemStack is offered from. * @return Amount of items used from the passed stack. @@ -23,12 +23,13 @@ public interface ISpecialInventory extends IInventory { * Requests items to be extracted from the inventory * * @param doRemove - * If false no actual extraction may occur. + * If false no actual extraction may occur. Implementors should simulate. + * Can be used to "peek" at what the result would be * @param from * Orientation the ItemStack is requested from. * @param maxItemCount * Maximum amount of items to extract (spread over all returned item stacks) - * @return Array of item stacks extracted from the inventory + * @return Array of item stacks that were/would be extracted from the inventory */ ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount); From cb8602439f4f79081ccdc9d02c1bd1499c92fa43 Mon Sep 17 00:00:00 2001 From: Krapht Date: Mon, 1 Apr 2013 01:31:33 +0200 Subject: [PATCH 87/93] Fix breaking fx for submod pipes --- common/buildcraft/transport/BlockGenericPipe.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 454b48ae..ac0c72fa 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -936,7 +936,7 @@ public class BlockGenericPipe extends BlockContainer { Pipe pipe = getPipe(worldObj, x, y, z); if (pipe == null) return false; - Icon icon = BuildCraftTransport.instance.pipeIconProvider.getIcon(pipe.getIconIndexForItem()); + Icon icon = pipe.getIconProvider().getIcon(pipe.getIconIndexForItem()); int sideHit = target.sideHit; @@ -996,7 +996,7 @@ public class BlockGenericPipe extends BlockContainer { Pipe pipe = getPipe(worldObj, x, y, z); if (pipe == null) return false; - Icon icon = BuildCraftTransport.instance.pipeIconProvider.getIcon(pipe.getIconIndexForItem()); + Icon icon = pipe.getIconProvider().getIcon(pipe.getIconIndexForItem()); byte its = 4; for (int i = 0; i < its; ++i) { From fa6393b95bc700b6fece328db028ec90d1a77968 Mon Sep 17 00:00:00 2001 From: SirSengir Date: Mon, 1 Apr 2013 10:55:51 +0200 Subject: [PATCH 88/93] Added NPE check to prevent a crash when certain config options are unused. --- common/buildcraft/BuildCraftTransport.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index e1b556ce..3849c364 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -238,15 +238,19 @@ public class BuildCraftTransport { Property exclusionItemList = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_BLOCK, "woodenPipe.item.exclusion", new String[0]); String[] excludedItemBlocks = exclusionItemList.getStringList(); - for (int j = 0; j < excludedItemBlocks.length; ++j) { - excludedItemBlocks[j] = excludedItemBlocks[j].trim(); + if(excludedItemBlocks != null) { + for (int j = 0; j < excludedItemBlocks.length; ++j) { + excludedItemBlocks[j] = excludedItemBlocks[j].trim(); + } } Property exclusionLiquidList = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_BLOCK, "woodenPipe.liquid.exclusion", new String[0]); String[] excludedLiquidBlocks = exclusionLiquidList.getStringList(); - for (int j = 0; j < excludedLiquidBlocks.length; ++j) { - excludedLiquidBlocks[j] = excludedLiquidBlocks[j].trim(); + if(excludedLiquidBlocks != null) { + for (int j = 0; j < excludedLiquidBlocks.length; ++j) { + excludedLiquidBlocks[j] = excludedLiquidBlocks[j].trim(); + } } PipeManager.registerExtractionHandler(new ExtractionHandler(excludedItemBlocks, excludedLiquidBlocks)); From 8f40131c372146276241e5758c9bbf2f77076d27 Mon Sep 17 00:00:00 2001 From: Krapht Date: Mon, 1 Apr 2013 16:21:12 +0200 Subject: [PATCH 89/93] Import cleanup, added warning supressions --- common/buildcraft/BuildCraftBuilders.java | 1 - common/buildcraft/BuildCraftEnergy.java | 1 - common/buildcraft/api/core/BuildCraftAPI.java | 1 - common/buildcraft/api/transport/FacadeManager.java | 1 + common/buildcraft/api/transport/IPipedItem.java | 1 - common/buildcraft/api/transport/PipeManager.java | 3 --- common/buildcraft/builders/BuilderProxyClient.java | 2 -- common/buildcraft/core/CommandBuildCraft.java | 1 + common/buildcraft/core/EntityPassiveItem.java | 1 - common/buildcraft/core/ItemRedstoneChipset.java | 1 + common/buildcraft/core/proxy/CoreProxy.java | 3 +++ common/buildcraft/core/proxy/CoreProxyClient.java | 2 +- .../buildcraft/core/triggers/ActionTriggerIconProvider.java | 2 -- common/buildcraft/core/utils/BlockUtil.java | 1 + common/buildcraft/core/utils/CraftingHelper.java | 1 + common/buildcraft/core/utils/SessionVars.java | 3 +++ common/buildcraft/energy/EnergyProxy.java | 3 --- common/buildcraft/energy/EnergyProxyClient.java | 6 ------ common/buildcraft/factory/FactoryProxyClient.java | 2 -- common/buildcraft/factory/TileQuarry.java | 1 + common/buildcraft/factory/TileTank.java | 2 -- common/buildcraft/factory/render/RenderTank.java | 1 - common/buildcraft/silicon/BlockAssemblyTable.java | 1 + .../silicon/gui/ContainerAssemblyAdvancedWorkbench.java | 1 + common/buildcraft/transport/ItemFacade.java | 2 +- common/buildcraft/transport/ItemGate.java | 2 +- common/buildcraft/transport/TileGenericPipe.java | 1 - common/buildcraft/transport/render/TileEntityPickupFX.java | 1 + .../transport/triggers/ActionSingleEnergyPulse.java | 6 ++---- 29 files changed, 20 insertions(+), 34 deletions(-) diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 8428f135..40582769 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.client.event.TextureLoadEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index adf70d56..559a55be 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -103,7 +103,6 @@ public class BuildCraftEnergy { } EnergyProxy.proxy.registerBlockRenderers(); EnergyProxy.proxy.registerTileEntities(); - EnergyProxy.proxy.registerTextureFX(); } @PreInit diff --git a/common/buildcraft/api/core/BuildCraftAPI.java b/common/buildcraft/api/core/BuildCraftAPI.java index 46a77c21..87c45fdf 100644 --- a/common/buildcraft/api/core/BuildCraftAPI.java +++ b/common/buildcraft/api/core/BuildCraftAPI.java @@ -10,7 +10,6 @@ package buildcraft.api.core; import net.minecraft.block.Block; -import net.minecraft.world.World; public class BuildCraftAPI { diff --git a/common/buildcraft/api/transport/FacadeManager.java b/common/buildcraft/api/transport/FacadeManager.java index d0421b90..f5333921 100644 --- a/common/buildcraft/api/transport/FacadeManager.java +++ b/common/buildcraft/api/transport/FacadeManager.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack; public class FacadeManager { private static Method addFacade; + @SuppressWarnings({ "unchecked", "rawtypes" }) public static void addFacade(ItemStack is) { try { if (addFacade == null) { diff --git a/common/buildcraft/api/transport/IPipedItem.java b/common/buildcraft/api/transport/IPipedItem.java index 272cad11..5dc85792 100644 --- a/common/buildcraft/api/transport/IPipedItem.java +++ b/common/buildcraft/api/transport/IPipedItem.java @@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.api.core.Position; -import buildcraft.api.core.SafeTimeTracker; public interface IPipedItem { diff --git a/common/buildcraft/api/transport/PipeManager.java b/common/buildcraft/api/transport/PipeManager.java index bccde42c..10736d63 100644 --- a/common/buildcraft/api/transport/PipeManager.java +++ b/common/buildcraft/api/transport/PipeManager.java @@ -2,11 +2,8 @@ package buildcraft.api.transport; import java.util.ArrayList; import java.util.List; -import java.util.TreeMap; import net.minecraft.world.World; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; public abstract class PipeManager { diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 3555d00b..d0546463 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -1,7 +1,5 @@ package buildcraft.builders; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.Icon; import buildcraft.BuildCraftBuilders; diff --git a/common/buildcraft/core/CommandBuildCraft.java b/common/buildcraft/core/CommandBuildCraft.java index 9815cf13..b7102ca7 100644 --- a/common/buildcraft/core/CommandBuildCraft.java +++ b/common/buildcraft/core/CommandBuildCraft.java @@ -30,6 +30,7 @@ public class CommandBuildCraft extends CommandBase { return true; } + @SuppressWarnings("rawtypes") @Override public List getCommandAliases() { return null; diff --git a/common/buildcraft/core/EntityPassiveItem.java b/common/buildcraft/core/EntityPassiveItem.java index 1b9bd8a6..e3854caf 100644 --- a/common/buildcraft/core/EntityPassiveItem.java +++ b/common/buildcraft/core/EntityPassiveItem.java @@ -22,7 +22,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import buildcraft.BuildCraftCore; import buildcraft.api.core.Position; -import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.transport.IPassiveItemContribution; import buildcraft.api.transport.IPipedItem; import buildcraft.core.proxy.CoreProxy; diff --git a/common/buildcraft/core/ItemRedstoneChipset.java b/common/buildcraft/core/ItemRedstoneChipset.java index 374180f1..90d58572 100644 --- a/common/buildcraft/core/ItemRedstoneChipset.java +++ b/common/buildcraft/core/ItemRedstoneChipset.java @@ -32,6 +32,7 @@ public class ItemRedstoneChipset extends ItemBuildCraft { return (new StringBuilder()).append(super.getUnlocalizedName()).append(".").append(itemstack.getItemDamage()).toString(); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List itemList) { diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java index e516d95c..558b62b4 100644 --- a/common/buildcraft/core/proxy/CoreProxy.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -71,6 +71,7 @@ public class CoreProxy { } /* WRAPPER */ + @SuppressWarnings("rawtypes") public void feedSubBlocks(int id, CreativeTabs tab, List itemList) { } @@ -101,6 +102,7 @@ public class CoreProxy { Item.itemsList[block.blockID] = new ItemBlockBuildCraft(block.blockID - 256, block.getUnlocalizedName()); } + @SuppressWarnings({ "rawtypes", "unchecked" }) public void registerTileEntity(Class clas, String ident) { GameRegistry.registerTileEntity(clas, ident); } @@ -109,6 +111,7 @@ public class CoreProxy { stack.onCrafting(world, player, stack.stackSize); } + @SuppressWarnings("unchecked") public void addCraftingRecipe(ItemStack result, Object[] recipe) { CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(result, recipe)); //GameRegistry.addRecipe(result, recipe); diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index fa078628..bdf36723 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -66,6 +65,7 @@ public class CoreProxyClient extends CoreProxy { } /* WRAPPER */ + @SuppressWarnings("rawtypes") public void feedSubBlocks(int id, CreativeTabs tab, List itemList) { if (Block.blocksList[id] == null) return; diff --git a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java index ac1a9a39..f3d242f1 100644 --- a/common/buildcraft/core/triggers/ActionTriggerIconProvider.java +++ b/common/buildcraft/core/triggers/ActionTriggerIconProvider.java @@ -47,8 +47,6 @@ public class ActionTriggerIconProvider implements IIconProvider { @SideOnly(Side.CLIENT) private Icon[] icons; - private boolean registered = false; - @Override @SideOnly(Side.CLIENT) public Icon getIcon(int iconIndex) { diff --git a/common/buildcraft/core/utils/BlockUtil.java b/common/buildcraft/core/utils/BlockUtil.java index bd9bd1bf..8e6809ad 100644 --- a/common/buildcraft/core/utils/BlockUtil.java +++ b/common/buildcraft/core/utils/BlockUtil.java @@ -98,6 +98,7 @@ public class BlockUtil { /** * Create an explosion which only affects a single block. */ + @SuppressWarnings("unchecked") public static void explodeBlock(World world, int x, int y, int z) { if (FMLCommonHandler.instance().getEffectiveSide().isClient()) return; diff --git a/common/buildcraft/core/utils/CraftingHelper.java b/common/buildcraft/core/utils/CraftingHelper.java index 2a4bfe12..19d6306d 100644 --- a/common/buildcraft/core/utils/CraftingHelper.java +++ b/common/buildcraft/core/utils/CraftingHelper.java @@ -12,6 +12,7 @@ import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; public class CraftingHelper { + @SuppressWarnings({ "unchecked", "rawtypes" }) public static IRecipe findMatchingRecipe(InventoryCrafting par1InventoryCrafting, World par2World) { int var3 = 0; diff --git a/common/buildcraft/core/utils/SessionVars.java b/common/buildcraft/core/utils/SessionVars.java index 1c55534c..74c00965 100644 --- a/common/buildcraft/core/utils/SessionVars.java +++ b/common/buildcraft/core/utils/SessionVars.java @@ -2,12 +2,15 @@ package buildcraft.core.utils; public class SessionVars { + @SuppressWarnings("rawtypes") private static Class openedLedger; + @SuppressWarnings("rawtypes") public static void setOpenedLedger(Class ledgerClass) { openedLedger = ledgerClass; } + @SuppressWarnings("rawtypes") public static Class getOpenedLedger() { return openedLedger; } diff --git a/common/buildcraft/energy/EnergyProxy.java b/common/buildcraft/energy/EnergyProxy.java index 0c635308..0a241d4a 100644 --- a/common/buildcraft/energy/EnergyProxy.java +++ b/common/buildcraft/energy/EnergyProxy.java @@ -11,9 +11,6 @@ public class EnergyProxy { GameRegistry.registerTileEntity(TileEngine.class, "net.minecraft.src.buildcraft.energy.Engine"); } - public void registerTextureFX() { - } - public void registerBlockRenderers() { } } diff --git a/common/buildcraft/energy/EnergyProxyClient.java b/common/buildcraft/energy/EnergyProxyClient.java index 11d5512b..b69a7691 100644 --- a/common/buildcraft/energy/EnergyProxyClient.java +++ b/common/buildcraft/energy/EnergyProxyClient.java @@ -5,7 +5,6 @@ import buildcraft.core.DefaultProps; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex; import buildcraft.energy.render.RenderEngine; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; public class EnergyProxyClient extends EnergyProxy { @@ -15,11 +14,6 @@ public class EnergyProxyClient extends EnergyProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEngine.class, new RenderEngine()); } - @Override - public void registerTextureFX() { - net.minecraft.client.renderer.RenderEngine renderEngine = FMLClientHandler.instance().getClient().renderEngine; - } - @Override public void registerBlockRenderers() { RenderingEntityBlocks.blockByEntityRenders.put(new EntityRenderIndex(BuildCraftEnergy.engineBlock, 0), new RenderEngine( diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 6abada33..276a6e5e 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -2,8 +2,6 @@ package buildcraft.factory; import java.lang.reflect.Method; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.Icon; import net.minecraft.world.World; import buildcraft.BuildCraftCore; diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 53389970..76e4d34c 100755 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -389,6 +389,7 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor, nbttagcompound.setTag("box", boxTag); } + @SuppressWarnings("rawtypes") public void positionReached() { inProcess = false; diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 7078cfd8..08440487 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -8,14 +8,12 @@ package buildcraft.factory; import static net.minecraftforge.common.ForgeDirection.DOWN; -import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; import buildcraft.BuildCraftCore; diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index 1558f733..435585fb 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -17,7 +17,6 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; diff --git a/common/buildcraft/silicon/BlockAssemblyTable.java b/common/buildcraft/silicon/BlockAssemblyTable.java index a66c7a94..0bf12d00 100644 --- a/common/buildcraft/silicon/BlockAssemblyTable.java +++ b/common/buildcraft/silicon/BlockAssemblyTable.java @@ -85,6 +85,7 @@ public class BlockAssemblyTable extends BlockContainer { return par1; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { diff --git a/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java b/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java index dfc58e16..05301fcf 100644 --- a/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java +++ b/common/buildcraft/silicon/gui/ContainerAssemblyAdvancedWorkbench.java @@ -46,6 +46,7 @@ public class ContainerAssemblyAdvancedWorkbench extends BuildCraftContainer { return workbench.isUseableByPlayer(var1); } + @SuppressWarnings("rawtypes") @Override public void detectAndSendChanges() { super.detectAndSendChanges(); diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 1343c316..cd215279 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -58,6 +58,7 @@ public class ItemFacade extends ItemBuildCraft { return "item.Facade"; } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List itemList) { @@ -93,7 +94,6 @@ public class ItemFacade extends ItemBuildCraft { } } - @SuppressWarnings("rawtypes") public static void initialize() { for (Field f : Block.class.getDeclaredFields()) { if (Modifier.isStatic(f.getModifiers()) && Block.class.isAssignableFrom(f.getType())) { diff --git a/common/buildcraft/transport/ItemGate.java b/common/buildcraft/transport/ItemGate.java index 5474cc7e..7c3d6e89 100644 --- a/common/buildcraft/transport/ItemGate.java +++ b/common/buildcraft/transport/ItemGate.java @@ -96,7 +96,7 @@ public class ItemGate extends ItemBuildCraft { return (new StringBuilder()).append(super.getUnlocalizedName()).append(".").append(itemstack.getItemDamage()).toString(); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List itemList) { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index fc41e147..47d8a63f 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -476,7 +476,6 @@ public class TileGenericPipe extends TileEntity implements IPowerReceptor, ITank private void computeConnections() { if (tileBuffer != null) { - boolean[] oldConnections = pipeConnectionsBuffer; pipeConnectionsBuffer = new boolean[6]; for (int i = 0; i < tileBuffer.length; ++i) { diff --git a/common/buildcraft/transport/render/TileEntityPickupFX.java b/common/buildcraft/transport/render/TileEntityPickupFX.java index 99132974..a891d059 100644 --- a/common/buildcraft/transport/render/TileEntityPickupFX.java +++ b/common/buildcraft/transport/render/TileEntityPickupFX.java @@ -26,6 +26,7 @@ import org.lwjgl.opengl.GL11; import buildcraft.core.utils.Utils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +//import net.minecraft.client.particle.EntityPickupFX; @SideOnly(Side.CLIENT) public class TileEntityPickupFX extends EntityFX diff --git a/common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java b/common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java index c8dfd800..062d6784 100644 --- a/common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java +++ b/common/buildcraft/transport/triggers/ActionSingleEnergyPulse.java @@ -1,12 +1,10 @@ package buildcraft.transport.triggers; import net.minecraft.util.Icon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import buildcraft.api.gates.IAction; -import buildcraft.core.DefaultProps; import buildcraft.core.triggers.ActionTriggerIconProvider; import buildcraft.core.triggers.BCAction; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ActionSingleEnergyPulse extends BCAction { From 1ad6209d42494b361747924840e0444e08c9ff22 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Tue, 2 Apr 2013 09:16:01 +0200 Subject: [PATCH 90/93] Players engine corrections to target a specific amount of energy in the engine before throttling --- common/buildcraft/energy/EngineStone.java | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/common/buildcraft/energy/EngineStone.java b/common/buildcraft/energy/EngineStone.java index 24f8a576..8fde6d7b 100644 --- a/common/buildcraft/energy/EngineStone.java +++ b/common/buildcraft/energy/EngineStone.java @@ -21,9 +21,16 @@ import buildcraft.core.utils.Utils; import buildcraft.energy.gui.ContainerEngine; public class EngineStone extends Engine { + final float maxProduction = 1f; + final float minProduction = maxProduction / 3; + final float target = 0.375f; + final float kp = 1f; + final float ki = 0.05f; + final float eLimit = (maxProduction - minProduction) / ki; int burnTime = 0; int totalBurnTime = 0; + float esum = 0; private ItemStack itemInInventory; @@ -75,8 +82,13 @@ public class EngineStone extends Engine { currentOutput = 0; if (burnTime > 0) { burnTime--; - currentOutput = 1; - addEnergy(1); + + float e = target * maxEnergy - energy; + + esum = Math.min(Math.max(esum + e, -eLimit), eLimit); + currentOutput = Math.min(Math.max(e * kp + esum * ki, minProduction), maxProduction); + + addEnergy(currentOutput); } if (burnTime == 0 && tile.isRedstonePowered) { @@ -142,7 +154,7 @@ public class EngineStone extends Engine { energy = j; break; case 1: - currentOutput = j; + currentOutput = j / 100f; break; case 2: burnTime = j; @@ -156,7 +168,7 @@ public class EngineStone extends Engine { @Override public void sendGUINetworkData(ContainerEngine containerEngine, ICrafting iCrafting) { iCrafting.sendProgressBarUpdate(containerEngine, 0, Math.round(energy)); - iCrafting.sendProgressBarUpdate(containerEngine, 1, Math.round(currentOutput)); + iCrafting.sendProgressBarUpdate(containerEngine, 1, Math.round(currentOutput * 100f)); iCrafting.sendProgressBarUpdate(containerEngine, 2, burnTime); iCrafting.sendProgressBarUpdate(containerEngine, 3, totalBurnTime); } @@ -214,4 +226,4 @@ public class EngineStone extends Engine { public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { return null; } -} +} \ No newline at end of file From f058b517b5e8d5ff15453ead06c2c4dfbffb435c Mon Sep 17 00:00:00 2001 From: Flow86 Date: Tue, 2 Apr 2013 09:24:31 +0200 Subject: [PATCH 91/93] add (independent) target for copying source only (build.xml can be used for sub-mods more easily then) target compile will use it then --- build.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index ad584de8..95f5b3b7 100644 --- a/build.xml +++ b/build.xml @@ -103,11 +103,7 @@ - - - - - + @@ -116,6 +112,12 @@ + + + + + + From 8881f1ff1270fc57e74ca601cecb359e33cbf96b Mon Sep 17 00:00:00 2001 From: Flow86 Date: Tue, 2 Apr 2013 12:32:52 +0300 Subject: [PATCH 92/93] Update build.xml change to newer forge (623 has a bug) --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 95f5b3b7..4059787c 100644 --- a/build.xml +++ b/build.xml @@ -18,7 +18,7 @@ - + From 09581d100bac9598e56576f2134e3fa9ab8afc31 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Tue, 2 Apr 2013 12:50:02 +0200 Subject: [PATCH 93/93] dont use Math.round merges and closes #696 --- common/buildcraft/energy/TileEngine.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index d85fa1b6..ff8b1d4b 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -120,7 +120,8 @@ public class TileEngine extends TileBuildCraft implements IPowerReceptor, IInven if (isPoweredTile(tile)) { IPowerProvider receptor = ((IPowerReceptor) tile).getPowerProvider(); - float extracted = engine.extractEnergy(receptor.getMinEnergyReceived(), receptor.getMaxEnergyReceived(), true); + float extracted = engine.extractEnergy(receptor.getMinEnergyReceived(), + Math.min(receptor.getMaxEnergyReceived(), receptor.getMaxEnergyStored() - (int) receptor.getEnergyStored()), true); if (extracted > 0) { receptor.receiveEnergy(extracted, engine.orientation.getOpposite());