From 277677837e65727fd9945ce080dd9af5bb081003 Mon Sep 17 00:00:00 2001
From: fewizz <hazeevaidar@yandex.ru>
Date: Thu, 1 Oct 2015 21:07:47 +0300
Subject: [PATCH] Cleanup, sounds for Chainsaws.

---
 build.properties                              |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../java/baubles/api/BaubleType.java          |   0
 .../java/baubles/api/BaublesApi.java          |   0
 .../java/baubles/api/IBauble.java             |   0
 .../java/baubles/api/package-info.java        |   0
 src/api/java/ic2/api/Direction.class          | Bin 0 -> 4220 bytes
 src/{main => api}/java/ic2/api/Direction.java |  22 +-
 .../java/ic2/api/crops/BaseSeed.class         | Bin
 .../java/ic2/api/crops/BaseSeed.java          |   0
 src/api/java/ic2/api/crops/CropCard.class     | Bin 0 -> 6026 bytes
 .../java/ic2/api/crops/CropCard.java          |   8 +-
 .../java/ic2/api/crops/Crops.class            | Bin
 .../java/ic2/api/crops/Crops.java             |   0
 .../java/ic2/api/crops/ICropTile.class        | Bin
 .../java/ic2/api/crops/ICropTile.java         |   0
 .../java/ic2/api/crops/package-info.class     | Bin
 .../java/ic2/api/crops/package-info.java      |   0
 .../java/ic2/api/energy/EnergyNet.class       | Bin
 .../java/ic2/api/energy/EnergyNet.java        |   0
 .../java/ic2/api/energy/IEnergyNet.class      | Bin
 .../java/ic2/api/energy/IEnergyNet.java       |   0
 .../java/ic2/api/energy/NodeStats.class       | Bin
 .../java/ic2/api/energy/NodeStats.java        |   0
 .../api/energy/event/EnergyTileEvent.class    | Bin
 .../ic2/api/energy/event/EnergyTileEvent.java |   0
 .../energy/event/EnergyTileLoadEvent.class    | Bin
 .../api/energy/event/EnergyTileLoadEvent.java |   0
 .../energy/event/EnergyTileUnloadEvent.class  | Bin
 .../energy/event/EnergyTileUnloadEvent.java   |   0
 .../ic2/api/energy/event/package-info.class   | Bin
 .../ic2/api/energy/event/package-info.java    |   0
 .../java/ic2/api/energy/package-info.class    | Bin
 .../java/ic2/api/energy/package-info.java     |   0
 .../ic2/api/energy/prefab/BasicSink.class     | Bin
 .../java/ic2/api/energy/prefab/BasicSink.java |   0
 .../ic2/api/energy/prefab/BasicSource.class   | Bin
 .../ic2/api/energy/prefab/BasicSource.java    |   0
 .../ic2/api/energy/prefab/package-info.class  | Bin
 .../ic2/api/energy/prefab/package-info.java   |   0
 .../ic2/api/energy/tile/IEnergyAcceptor.class | Bin
 .../ic2/api/energy/tile/IEnergyAcceptor.java  |   0
 .../api/energy/tile/IEnergyConductor.class    | Bin
 .../ic2/api/energy/tile/IEnergyConductor.java |   0
 .../ic2/api/energy/tile/IEnergyEmitter.class  | Bin
 .../ic2/api/energy/tile/IEnergyEmitter.java   |   0
 .../ic2/api/energy/tile/IEnergySink.class     | Bin
 .../java/ic2/api/energy/tile/IEnergySink.java |   0
 .../ic2/api/energy/tile/IEnergySource.class   | Bin
 .../ic2/api/energy/tile/IEnergySource.java    |   0
 .../ic2/api/energy/tile/IEnergyTile.class     | Bin
 .../java/ic2/api/energy/tile/IEnergyTile.java |   0
 .../ic2/api/energy/tile/IHeatSource.class     | Bin
 .../java/ic2/api/energy/tile/IHeatSource.java |   0
 .../ic2/api/energy/tile/IKineticSource.class  | Bin
 .../ic2/api/energy/tile/IKineticSource.java   |   0
 .../ic2/api/energy/tile/IMetaDelegate.class   | Bin
 .../ic2/api/energy/tile/IMetaDelegate.java    |   0
 .../ic2/api/energy/tile/package-info.class    | Bin
 .../ic2/api/energy/tile/package-info.java     |   0
 .../java/ic2/api/energy/usage.txt             |   0
 .../java/ic2/api/event/ExplosionEvent.class   | Bin
 .../java/ic2/api/event/ExplosionEvent.java    |   0
 .../event/LaserEvent$LaserExplodesEvent.class | Bin
 .../LaserEvent$LaserHitsBlockEvent.class      | Bin
 .../LaserEvent$LaserHitsEntityEvent.class     | Bin
 .../event/LaserEvent$LaserShootEvent.class    | Bin
 .../java/ic2/api/event/LaserEvent.class       | Bin
 .../java/ic2/api/event/LaserEvent.java        |   0
 .../java/ic2/api/event/PaintEvent.class       | Bin
 .../java/ic2/api/event/PaintEvent.java        |   0
 .../java/ic2/api/event/RetextureEvent.class   | Bin
 .../java/ic2/api/event/RetextureEvent.java    |   0
 .../java/ic2/api/event/package-info.class     | Bin
 .../java/ic2/api/event/package-info.java      |   0
 .../ic2/api/info/IEnergyValueProvider.class   | Bin
 .../ic2/api/info/IEnergyValueProvider.java    |   0
 .../ic2/api/info/IFuelValueProvider.class     | Bin
 .../java/ic2/api/info/IFuelValueProvider.java |   0
 .../java/ic2/api/info/Info.class              | Bin
 src/{main => api}/java/ic2/api/info/Info.java |   0
 .../java/ic2/api/info/package-info.class      | Bin
 .../java/ic2/api/info/package-info.java       |   0
 .../java/ic2/api/item/ElectricItem.class      | Bin
 .../java/ic2/api/item/ElectricItem.java       |   0
 .../api/item/IBackupElectricItemManager.class | Bin
 .../api/item/IBackupElectricItemManager.java  |   0
 .../ic2/api/item/IBlockCuttingBlade.class     | Bin
 .../java/ic2/api/item/IBlockCuttingBlade.java |   0
 .../java/ic2/api/item/IBoxable.class          | Bin
 .../java/ic2/api/item/IBoxable.java           |   0
 .../java/ic2/api/item/IC2Items.class          | Bin
 .../java/ic2/api/item/IC2Items.java           |   0
 .../java/ic2/api/item/ICustomDamageItem.class | Bin
 .../java/ic2/api/item/ICustomDamageItem.java  |   0
 .../java/ic2/api/item/IDebuggable.class       | Bin
 .../java/ic2/api/item/IDebuggable.java        |   0
 .../java/ic2/api/item/IElectricItem.class     | Bin
 .../java/ic2/api/item/IElectricItem.java      |   0
 .../ic2/api/item/IElectricItemManager.class   | Bin
 .../ic2/api/item/IElectricItemManager.java    |   0
 .../java/ic2/api/item/IItemHudInfo.class      | Bin
 .../java/ic2/api/item/IItemHudInfo.java       |   0
 .../api/item/IKineticRotor$GearboxType.class  | Bin 0 -> 1131 bytes
 src/api/java/ic2/api/item/IKineticRotor.class | Bin 0 -> 590 bytes
 .../java/ic2/api/item/IKineticRotor.java}     |   9 +-
 .../ic2/api/item/ILatheItem$ILatheTool.class  | Bin 0 -> 294 bytes
 src/api/java/ic2/api/item/ILatheItem.class    | Bin 0 -> 775 bytes
 .../java/ic2/api/item/ILatheItem.java         |  23 ++
 .../java/ic2/api/item/IMetalArmor.class       | Bin
 .../java/ic2/api/item/IMetalArmor.java        |   0
 .../ic2/api/item/ISpecialElectricItem.class   | Bin
 .../ic2/api/item/ISpecialElectricItem.java    |   0
 .../java/ic2/api/item/ITerraformingBP.class   | Bin
 .../java/ic2/api/item/ITerraformingBP.java    |   0
 .../java/ic2/api/item/ItemWrapper.class       | Bin
 .../java/ic2/api/item/ItemWrapper.java        |   0
 .../java/ic2/api/item/package-info.class      | Bin
 .../java/ic2/api/item/package-info.java       |   0
 ...NetworkClientTileEntityEventListener.class | Bin
 ...INetworkClientTileEntityEventListener.java |   0
 .../api/network/INetworkDataProvider.class    | Bin
 .../ic2/api/network/INetworkDataProvider.java |   0
 .../network/INetworkItemEventListener.class   | Bin
 .../network/INetworkItemEventListener.java    |   0
 .../INetworkTileEntityEventListener.class     | Bin
 .../INetworkTileEntityEventListener.java      |   0
 .../api/network/INetworkUpdateListener.class  | Bin
 .../api/network/INetworkUpdateListener.java   |   0
 .../java/ic2/api/network/NetworkHelper.class  | Bin 0 -> 4263 bytes
 .../java/ic2/api/network/NetworkHelper.java   |   2 +-
 .../java/ic2/api/network/package-info.class   | Bin
 .../java/ic2/api/network/package-info.java    |   0
 .../java/ic2/api/package-info.class           | Bin
 .../java/ic2/api/package-info.java            |   0
 .../java/ic2/api/reactor/IReactor.class       | Bin
 .../java/ic2/api/reactor/IReactor.java        |   0
 .../ic2/api/reactor/IReactorChamber.class     | Bin
 .../java/ic2/api/reactor/IReactorChamber.java |   0
 .../ic2/api/reactor/IReactorComponent.class   | Bin
 .../ic2/api/reactor/IReactorComponent.java    |   0
 .../java/ic2/api/reactor/package-info.class   | Bin
 .../java/ic2/api/reactor/package-info.java    |   0
 .../ICannerBottleRecipeManager$Input.class    | Bin
 .../recipe/ICannerBottleRecipeManager.class   | Bin
 .../recipe/ICannerBottleRecipeManager.java    |   0
 .../ICannerEnrichRecipeManager$Input.class    | Bin
 .../recipe/ICannerEnrichRecipeManager.class   | Bin
 .../recipe/ICannerEnrichRecipeManager.java    |   0
 .../api/recipe/ICraftingRecipeManager.class   | Bin
 .../api/recipe/ICraftingRecipeManager.java    |   0
 .../IFluidHeatManager$BurnProperty.class      | Bin
 .../ic2/api/recipe/IFluidHeatManager.class    | Bin
 .../ic2/api/recipe/IFluidHeatManager.java     |   0
 .../ic2/api/recipe/ILiquidAcceptManager.class | Bin
 .../ic2/api/recipe/ILiquidAcceptManager.java  |   0
 ...xchangerManager$HeatExchangeProperty.class | Bin 0 -> 662 bytes
 .../recipe/ILiquidHeatExchangerManager.class  | Bin 0 -> 696 bytes
 .../recipe/ILiquidHeatExchangerManager.java   |  25 ++
 .../ic2/api/recipe/IListRecipeManager.class   | Bin
 .../ic2/api/recipe/IListRecipeManager.java    |   0
 .../api/recipe/IMachineRecipeManager.class    | Bin
 .../ic2/api/recipe/IMachineRecipeManager.java |   0
 .../api/recipe/IMachineRecipeManagerExt.class | Bin
 .../api/recipe/IMachineRecipeManagerExt.java  |   0
 .../java/ic2/api/recipe/IPatternStorage.class | Bin
 .../java/ic2/api/recipe/IPatternStorage.java  |   0
 .../java/ic2/api/recipe/IRecipeInput.class    | Bin
 .../java/ic2/api/recipe/IRecipeInput.java     |   0
 .../ic2/api/recipe/IScrapboxManager.class     | Bin
 .../java/ic2/api/recipe/IScrapboxManager.java |   0
 .../ISemiFluidFuelManager$BurnProperty.class  | Bin
 .../api/recipe/ISemiFluidFuelManager.class    | Bin
 .../ic2/api/recipe/ISemiFluidFuelManager.java |   0
 .../recipe/RecipeInputFluidContainer.class    | Bin
 .../api/recipe/RecipeInputFluidContainer.java |   0
 .../ic2/api/recipe/RecipeInputItemStack.class | Bin
 .../ic2/api/recipe/RecipeInputItemStack.java  |   0
 .../ic2/api/recipe/RecipeInputOreDict.class   | Bin
 .../ic2/api/recipe/RecipeInputOreDict.java    |   0
 .../java/ic2/api/recipe/RecipeOutput.class    | Bin 2596 -> 2596 bytes
 .../java/ic2/api/recipe/RecipeOutput.java     |   3 +-
 .../java/ic2/api/recipe/Recipes.class         | Bin 1090 -> 1199 bytes
 .../java/ic2/api/recipe/Recipes.java          |  16 +-
 .../java/ic2/api/recipe/package-info.class    | Bin
 .../java/ic2/api/recipe/package-info.java     |   0
 .../ic2/api/tile/ExplosionWhitelist.class     | Bin
 .../java/ic2/api/tile/ExplosionWhitelist.java |   0
 .../java/ic2/api/tile/IEnergyStorage.class    | Bin
 .../java/ic2/api/tile/IEnergyStorage.java     |   0
 .../java/ic2/api/tile/IWrenchable.class       | Bin
 .../java/ic2/api/tile/IWrenchable.java        |   0
 .../java/ic2/api/tile/package-info.class      | Bin
 .../java/ic2/api/tile/package-info.java       |   0
 .../java/ic2/api/util/IKeyboard.class         | Bin
 .../java/ic2/api/util/IKeyboard.java          |   0
 .../java/ic2/api/util/Keys.class              | Bin
 src/{main => api}/java/ic2/api/util/Keys.java |   0
 .../java/ic2/api/util/package-info.class      | Bin
 .../java/ic2/api/util/package-info.java       |   0
 .../java/thaumcraft/api/BlockCoordinates.java |   0
 .../java/thaumcraft/api/IArchitect.java       |   0
 .../java/thaumcraft/api/IGoggles.java         |   0
 .../java/thaumcraft/api/IRepairable.java      |   0
 .../thaumcraft/api/IRepairableExtended.java   |   0
 .../java/thaumcraft/api/IRunicArmor.java      |   0
 .../java/thaumcraft/api/IScribeTools.java     |   0
 .../java/thaumcraft/api/IVisDiscountGear.java |   0
 .../java/thaumcraft/api/IWarpingGear.java     |   0
 .../java/thaumcraft/api/ItemApi.java          |   0
 .../java/thaumcraft/api/ItemRunic.java        |   0
 .../java/thaumcraft/api/ThaumcraftApi.java    |   0
 .../thaumcraft/api/ThaumcraftApiHelper.java   |   0
 .../java/thaumcraft/api/TileThaumcraft.java   |   0
 .../java/thaumcraft/api/WorldCoordinates.java |   0
 .../java/thaumcraft/api/aspects/Aspect.java   |   0
 .../thaumcraft/api/aspects/AspectList.java    |   0
 .../api/aspects/AspectSourceHelper.java       |   0
 .../api/aspects/IAspectContainer.java         |   0
 .../thaumcraft/api/aspects/IAspectSource.java |   0
 .../api/aspects/IEssentiaContainerItem.java   |   0
 .../api/aspects/IEssentiaTransport.java       |   0
 .../api/crafting/CrucibleRecipe.java          |   0
 .../api/crafting/IArcaneRecipe.java           |   0
 .../api/crafting/IInfusionStabiliser.java     |   0
 .../crafting/InfusionEnchantmentRecipe.java   |   0
 .../api/crafting/InfusionRecipe.java          |   0
 .../api/crafting/ShapedArcaneRecipe.java      |   0
 .../api/crafting/ShapelessArcaneRecipe.java   |   0
 .../DamageSourceIndirectThaumcraftEntity.java |   0
 .../damagesource/DamageSourceThaumcraft.java  |   0
 .../thaumcraft/api/entities/IEldritchMob.java |   0
 .../thaumcraft/api/entities/ITaintedMob.java  |   0
 .../internal/DummyInternalMethodHandler.java  |   0
 .../api/internal/IInternalMethodHandler.java  |   0
 .../api/internal/WeightedRandomLoot.java      |   0
 .../java/thaumcraft/api/nodes/INode.java      |   0
 .../java/thaumcraft/api/nodes/IRevealer.java  |   0
 .../thaumcraft/api/nodes/NodeModifier.java    |   0
 .../java/thaumcraft/api/nodes/NodeType.java   |   0
 .../java/thaumcraft/api/package-info.java     |   0
 .../api/potions/PotionFluxTaint.java          |   0
 .../api/potions/PotionVisExhaust.java         |   0
 .../api/research/IScanEventHandler.java       |   0
 .../api/research/ResearchCategories.java      |   0
 .../api/research/ResearchCategoryList.java    |   0
 .../thaumcraft/api/research/ResearchItem.java |   0
 .../thaumcraft/api/research/ResearchPage.java |   0
 .../thaumcraft/api/research/ScanResult.java   |   0
 .../thaumcraft/api/visnet/TileVisNode.java    |   0
 .../thaumcraft/api/visnet/VisNetHandler.java  |   0
 .../api/wands/FocusUpgradeType.java           |   0
 .../api/wands/IWandRodOnUpdate.java           |   0
 .../api/wands/IWandTriggerManager.java        |   0
 .../java/thaumcraft/api/wands/IWandable.java  |   0
 .../thaumcraft/api/wands/ItemFocusBasic.java  |   0
 .../java/thaumcraft/api/wands/StaffRod.java   |   0
 .../java/thaumcraft/api/wands/WandCap.java    |   0
 .../java/thaumcraft/api/wands/WandRod.java    |   0
 .../api/wands/WandTriggerRegistry.java        |   0
 src/main/java/ic2/api/Direction.class         | Bin 3644 -> 0 bytes
 src/main/java/ic2/api/crops/CropCard.class    | Bin 6036 -> 0 bytes
 .../java/ic2/api/item/IKineticWindRotor.class | Bin 408 -> 0 bytes
 src/main/java/ic2/api/item/ILatheItem.class   | Bin 669 -> 0 bytes
 .../java/ic2/api/network/NetworkHelper.class  | Bin 4190 -> 0 bytes
 .../tombenpotter/emt/ElectroMagicTools.java   |  12 -
 .../java/tombenpotter/emt/client/EMTKeys.java |  26 +-
 .../emt/client/gui/GuiEtherealMacerator.java  |  12 -
 .../gui/GuiIndustrialWandRecharger.java       |  12 -
 .../container/ContainerEtheralMacerator.java  |  12 -
 .../ContainerIndustrialWandRecharge.java      |  12 -
 .../emt/client/model/ModelCpecialArmor.java   |   1 -
 .../emt/client/renderer/RenderArcher.java     |  22 -
 .../emt/client/renderer/RenderLaser.java      |  12 -
 .../tombenpotter/emt/common/EMTResearch.java  |  12 -
 .../emt/common/RecipeRegistry.java            |  12 -
 .../emt/common/blocks/BlockEMTMachines.java   |  12 -
 .../emt/common/blocks/BlockEMTSolars.java     |  12 -
 .../emt/common/blocks/BlockEMTSolars2.java    |  12 -
 .../blocks/BlockEssentiaGenerators.java       |  12 -
 .../emt/common/blocks/BlockPortableNode.java  |  12 -
 .../emt/common/blocks/BlockRegistry.java      |   4 -
 .../emt/common/blocks/BlockShield.java        |  12 -
 .../common/entities/BaseEntityRegistry.java   |  15 +-
 .../emt/common/entities/EntityArcher.java     |  12 -
 .../emt/common/entities/EntityLaser.java      |   8 +-
 .../emt/common/items/ItemBaseChainsaw.java    | 127 ------
 .../emt/common/items/ItemBaseDrill.java       |  89 ----
 .../emt/common/items/ItemBaseOmnitool.java    | 122 ------
 .../items/ItemElectricScribingTools.java      |  12 -
 .../emt/common/items/ItemMaterials.java       |  12 -
 .../emt/common/items/ItemRegistry.java        |   4 +-
 .../emt/common/items/ItemShardCarver.java     |  14 -
 .../boots/ItemElectricBootsTraveller.java     |  21 -
 .../armor/boots/ItemNanoBootsTraveller.java   |  21 -
 .../boots/ItemQuantumBootsTraveller.java      |  21 -
 .../ItemInfusedQuantumChestplate.java}        | 389 ++++++++----------
 .../armor/goggles/ItemElectricGoggles.java    |  12 -
 .../items/armor/goggles/ItemNanoGoggles.java  |  12 -
 .../armor/goggles/ItemQuantumGoggles.java     |  12 -
 .../goggles/ItemSolarHelmetRevealing.java     |  12 -
 .../items/armor/wings/ItemFeatherWing.java    |   8 +-
 .../items/armor/wings/ItemNanoWing.java       |   4 +-
 .../items/armor/wings/ItemQuantumWing.java    |   9 +-
 .../wings/ItemThaumiumReinforcedWing.java     |   2 +-
 .../items/blocks/ItemBlockEMTMachines.java    |  12 -
 .../items/blocks/ItemBlockEMTSolars.java      |  12 -
 .../items/blocks/ItemBlockEMTSolars2.java     |  12 -
 .../blocks/ItemBlockEssentiaGenerators.java   |  12 -
 .../common/items/foci/ItemChargeFocus.java    |  12 -
 .../common/items/foci/ItemChristmasFocus.java |  12 -
 .../common/items/foci/ItemExplosionFocus.java |  12 -
 .../common/items/foci/ItemShieldFocus.java    |  12 -
 .../items/tools/ItemElectricHoeGrowth.java    |  26 +-
 .../items/tools/ItemElectricThorHammer.java   |  12 -
 .../common/items/tools/ItemThorHammer.java    |  12 -
 .../items/tools/ItemThorHammerBroken.java     |  12 -
 .../items/tools/ItemVanillaChainsaw.java      |  66 ---
 .../common/items/tools/ItemVanillaDrill.java  |  32 --
 .../items/tools/ItemVanillaOmnitool.java      |  66 ---
 .../tools/chainsaws/ItemDiamondChainsaw.java  |  39 +-
 .../tools/chainsaws/ItemStreamChainsaw.java   |  41 +-
 .../tools/chainsaws/ItemThaumiumChainsaw.java |  38 +-
 .../tools/drills/ItemRockbreakerDrill.java    |  14 -
 .../items/tools/drills/ItemThaumiumDrill.java |  12 -
 .../tools/omnitools/ItemOmnitoolDiamond.java  |  12 -
 .../tools/omnitools/ItemOmnitoolIron.java     |  12 -
 .../tools/omnitools/ItemOmnitoolThaumium.java |  12 -
 .../tile/TileEntityEtherealMacerator.java     |  12 -
 .../TileEntityIndustrialWandRecharge.java     |  12 -
 .../common/tile/TileEntityPortableNode.java   |  12 -
 .../generators/TileEntityArborGenerator.java  |  12 -
 .../generators/TileEntityAuramGenerator.java  |  12 -
 .../generators/TileEntityIgnisGenerator.java  |  12 -
 .../TileEntityPotentiaGenerator.java          |  12 -
 .../tile/solars/air/TileEntityAirSolar.java   |  12 -
 .../solars/air/TileEntityDoubleAirSolar.java  |  12 -
 .../solars/air/TileEntityTripleAirSolar.java  |  12 -
 .../compressed/TileEntityCompressedSolar.java |  12 -
 .../TileEntityDoubleCompressedSolar.java      |  12 -
 .../TileEntityTripleCompressedSolar.java      |  12 -
 .../tile/solars/dark/TileEntityDarkSolar.java |  12 -
 .../dark/TileEntityDoubleDarkSolar.java       |  12 -
 .../dark/TileEntityTripleDarkSolar.java       |  12 -
 .../earth/TileEntityDoubleEarthSolar.java     |  12 -
 .../solars/earth/TileEntityEarthSolar.java    |  12 -
 .../earth/TileEntityTripleEarthSolar.java     |  12 -
 .../fire/TileEntityDoubleFireSolar.java       |  12 -
 .../tile/solars/fire/TileEntityFireSolar.java |  12 -
 .../fire/TileEntityTripleFireSolar.java       |  12 -
 .../order/TileEntityDoubleOrderSolar.java     |  12 -
 .../solars/order/TileEntityOrderSolar.java    |  12 -
 .../order/TileEntityTripleOrderSolar.java     |  12 -
 .../water/TileEntityDoubleWaterSolar.java     |  12 -
 .../water/TileEntityTripleWaterSolar.java     |  12 -
 .../solars/water/TileEntityWaterSolar.java    |  12 -
 .../emt/common/util/CraftingAspects.java      |  12 -
 .../emt/common/util/CreativeTabEMT.java       |  12 -
 .../emt/common/util/EMTResearchItem.java      |  21 -
 .../emt/common/util/EventHandlerEMT.java      |  25 +-
 .../emt/common/util/ResearchAspects.java      |  12 -
 .../tombenpotter/emt/proxies/ClientProxy.java |  16 +-
 .../tombenpotter/emt/proxies/CommonProxy.java |  12 -
 .../assets/electromagictools/lang/en_US.lang  |  12 +-
 .../assets/electromagictools/lang/ru_RU.lang  |  12 +-
 .../textures/blocks/solars/air/airside32.png  | Bin 5261 -> 0 bytes
 .../textures/blocks/solars/bottom32.png       | Bin 1053 -> 0 bytes
 .../blocks/solars/dark/darkside32.png         | Bin 4735 -> 0 bytes
 .../textures/blocks/solars/doublesolartop.png | Bin 2091 -> 1421 bytes
 .../blocks/solars/doublesolartop32.png        | Bin 1265 -> 0 bytes
 .../blocks/solars/earth/earthside32.png       | Bin 5236 -> 0 bytes
 .../blocks/solars/fire/fireside32.png         | Bin 5431 -> 0 bytes
 .../blocks/solars/order/orderside32.png       | Bin 5120 -> 0 bytes
 .../textures/blocks/solars/side32.png         | Bin 1122 -> 0 bytes
 .../textures/blocks/solars/solartop.png       | Bin 2707 -> 1963 bytes
 .../textures/blocks/solars/solartop32.png     | Bin 1967 -> 0 bytes
 .../textures/blocks/solars/triplesolartop.png | Bin 2661 -> 1670 bytes
 .../blocks/solars/triplesolartop32.png        | Bin 1724 -> 0 bytes
 .../blocks/solars/water/waterside32.png       | Bin 5065 -> 0 bytes
 379 files changed, 392 insertions(+), 1851 deletions(-)
 rename src/{main => api}/java/baubles/api/BaubleType.java (100%)
 rename src/{main => api}/java/baubles/api/BaublesApi.java (100%)
 rename src/{main => api}/java/baubles/api/IBauble.java (100%)
 rename src/{main => api}/java/baubles/api/package-info.java (100%)
 create mode 100644 src/api/java/ic2/api/Direction.class
 rename src/{main => api}/java/ic2/api/Direction.java (83%)
 rename src/{main => api}/java/ic2/api/crops/BaseSeed.class (100%)
 rename src/{main => api}/java/ic2/api/crops/BaseSeed.java (100%)
 create mode 100644 src/api/java/ic2/api/crops/CropCard.class
 rename src/{main => api}/java/ic2/api/crops/CropCard.java (98%)
 rename src/{main => api}/java/ic2/api/crops/Crops.class (100%)
 rename src/{main => api}/java/ic2/api/crops/Crops.java (100%)
 rename src/{main => api}/java/ic2/api/crops/ICropTile.class (100%)
 rename src/{main => api}/java/ic2/api/crops/ICropTile.java (100%)
 rename src/{main => api}/java/ic2/api/crops/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/crops/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/energy/EnergyNet.class (100%)
 rename src/{main => api}/java/ic2/api/energy/EnergyNet.java (100%)
 rename src/{main => api}/java/ic2/api/energy/IEnergyNet.class (100%)
 rename src/{main => api}/java/ic2/api/energy/IEnergyNet.java (100%)
 rename src/{main => api}/java/ic2/api/energy/NodeStats.class (100%)
 rename src/{main => api}/java/ic2/api/energy/NodeStats.java (100%)
 rename src/{main => api}/java/ic2/api/energy/event/EnergyTileEvent.class (100%)
 rename src/{main => api}/java/ic2/api/energy/event/EnergyTileEvent.java (100%)
 rename src/{main => api}/java/ic2/api/energy/event/EnergyTileLoadEvent.class (100%)
 rename src/{main => api}/java/ic2/api/energy/event/EnergyTileLoadEvent.java (100%)
 rename src/{main => api}/java/ic2/api/energy/event/EnergyTileUnloadEvent.class (100%)
 rename src/{main => api}/java/ic2/api/energy/event/EnergyTileUnloadEvent.java (100%)
 rename src/{main => api}/java/ic2/api/energy/event/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/energy/event/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/energy/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/energy/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/energy/prefab/BasicSink.class (100%)
 rename src/{main => api}/java/ic2/api/energy/prefab/BasicSink.java (100%)
 rename src/{main => api}/java/ic2/api/energy/prefab/BasicSource.class (100%)
 rename src/{main => api}/java/ic2/api/energy/prefab/BasicSource.java (100%)
 rename src/{main => api}/java/ic2/api/energy/prefab/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/energy/prefab/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyAcceptor.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyAcceptor.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyConductor.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyConductor.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyEmitter.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyEmitter.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergySink.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergySink.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergySource.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergySource.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyTile.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IEnergyTile.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IHeatSource.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IHeatSource.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IKineticSource.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IKineticSource.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IMetaDelegate.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/IMetaDelegate.java (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/energy/tile/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/energy/usage.txt (100%)
 rename src/{main => api}/java/ic2/api/event/ExplosionEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/ExplosionEvent.java (100%)
 rename src/{main => api}/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/LaserEvent$LaserShootEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/LaserEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/LaserEvent.java (100%)
 rename src/{main => api}/java/ic2/api/event/PaintEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/PaintEvent.java (100%)
 rename src/{main => api}/java/ic2/api/event/RetextureEvent.class (100%)
 rename src/{main => api}/java/ic2/api/event/RetextureEvent.java (100%)
 rename src/{main => api}/java/ic2/api/event/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/event/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/info/IEnergyValueProvider.class (100%)
 rename src/{main => api}/java/ic2/api/info/IEnergyValueProvider.java (100%)
 rename src/{main => api}/java/ic2/api/info/IFuelValueProvider.class (100%)
 rename src/{main => api}/java/ic2/api/info/IFuelValueProvider.java (100%)
 rename src/{main => api}/java/ic2/api/info/Info.class (100%)
 rename src/{main => api}/java/ic2/api/info/Info.java (100%)
 rename src/{main => api}/java/ic2/api/info/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/info/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/item/ElectricItem.class (100%)
 rename src/{main => api}/java/ic2/api/item/ElectricItem.java (100%)
 rename src/{main => api}/java/ic2/api/item/IBackupElectricItemManager.class (100%)
 rename src/{main => api}/java/ic2/api/item/IBackupElectricItemManager.java (100%)
 rename src/{main => api}/java/ic2/api/item/IBlockCuttingBlade.class (100%)
 rename src/{main => api}/java/ic2/api/item/IBlockCuttingBlade.java (100%)
 rename src/{main => api}/java/ic2/api/item/IBoxable.class (100%)
 rename src/{main => api}/java/ic2/api/item/IBoxable.java (100%)
 rename src/{main => api}/java/ic2/api/item/IC2Items.class (100%)
 rename src/{main => api}/java/ic2/api/item/IC2Items.java (100%)
 rename src/{main => api}/java/ic2/api/item/ICustomDamageItem.class (100%)
 rename src/{main => api}/java/ic2/api/item/ICustomDamageItem.java (100%)
 rename src/{main => api}/java/ic2/api/item/IDebuggable.class (100%)
 rename src/{main => api}/java/ic2/api/item/IDebuggable.java (100%)
 rename src/{main => api}/java/ic2/api/item/IElectricItem.class (100%)
 rename src/{main => api}/java/ic2/api/item/IElectricItem.java (100%)
 rename src/{main => api}/java/ic2/api/item/IElectricItemManager.class (100%)
 rename src/{main => api}/java/ic2/api/item/IElectricItemManager.java (100%)
 rename src/{main => api}/java/ic2/api/item/IItemHudInfo.class (100%)
 rename src/{main => api}/java/ic2/api/item/IItemHudInfo.java (100%)
 create mode 100644 src/api/java/ic2/api/item/IKineticRotor$GearboxType.class
 create mode 100644 src/api/java/ic2/api/item/IKineticRotor.class
 rename src/{main/java/ic2/api/item/IKineticWindRotor.java => api/java/ic2/api/item/IKineticRotor.java} (68%)
 create mode 100644 src/api/java/ic2/api/item/ILatheItem$ILatheTool.class
 create mode 100644 src/api/java/ic2/api/item/ILatheItem.class
 rename src/{main => api}/java/ic2/api/item/ILatheItem.java (61%)
 rename src/{main => api}/java/ic2/api/item/IMetalArmor.class (100%)
 rename src/{main => api}/java/ic2/api/item/IMetalArmor.java (100%)
 rename src/{main => api}/java/ic2/api/item/ISpecialElectricItem.class (100%)
 rename src/{main => api}/java/ic2/api/item/ISpecialElectricItem.java (100%)
 rename src/{main => api}/java/ic2/api/item/ITerraformingBP.class (100%)
 rename src/{main => api}/java/ic2/api/item/ITerraformingBP.java (100%)
 rename src/{main => api}/java/ic2/api/item/ItemWrapper.class (100%)
 rename src/{main => api}/java/ic2/api/item/ItemWrapper.java (100%)
 rename src/{main => api}/java/ic2/api/item/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/item/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkClientTileEntityEventListener.class (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkClientTileEntityEventListener.java (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkDataProvider.class (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkDataProvider.java (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkItemEventListener.class (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkItemEventListener.java (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkTileEntityEventListener.class (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkTileEntityEventListener.java (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkUpdateListener.class (100%)
 rename src/{main => api}/java/ic2/api/network/INetworkUpdateListener.java (100%)
 create mode 100644 src/api/java/ic2/api/network/NetworkHelper.class
 rename src/{main => api}/java/ic2/api/network/NetworkHelper.java (97%)
 rename src/{main => api}/java/ic2/api/network/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/network/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/reactor/IReactor.class (100%)
 rename src/{main => api}/java/ic2/api/reactor/IReactor.java (100%)
 rename src/{main => api}/java/ic2/api/reactor/IReactorChamber.class (100%)
 rename src/{main => api}/java/ic2/api/reactor/IReactorChamber.java (100%)
 rename src/{main => api}/java/ic2/api/reactor/IReactorComponent.class (100%)
 rename src/{main => api}/java/ic2/api/reactor/IReactorComponent.java (100%)
 rename src/{main => api}/java/ic2/api/reactor/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/reactor/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICannerBottleRecipeManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICannerBottleRecipeManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICannerEnrichRecipeManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICannerEnrichRecipeManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICraftingRecipeManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ICraftingRecipeManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IFluidHeatManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IFluidHeatManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/ILiquidAcceptManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ILiquidAcceptManager.java (100%)
 create mode 100644 src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager$HeatExchangeProperty.class
 create mode 100644 src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.class
 create mode 100644 src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
 rename src/{main => api}/java/ic2/api/recipe/IListRecipeManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IListRecipeManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/IMachineRecipeManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IMachineRecipeManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/IMachineRecipeManagerExt.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IMachineRecipeManagerExt.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/IPatternStorage.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IPatternStorage.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/IRecipeInput.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IRecipeInput.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/IScrapboxManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/IScrapboxManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ISemiFluidFuelManager.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/ISemiFluidFuelManager.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeInputFluidContainer.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeInputFluidContainer.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeInputItemStack.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeInputItemStack.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeInputOreDict.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeInputOreDict.java (100%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeOutput.class (90%)
 rename src/{main => api}/java/ic2/api/recipe/RecipeOutput.java (94%)
 rename src/{main => api}/java/ic2/api/recipe/Recipes.class (51%)
 rename src/{main => api}/java/ic2/api/recipe/Recipes.java (84%)
 rename src/{main => api}/java/ic2/api/recipe/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/recipe/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/tile/ExplosionWhitelist.class (100%)
 rename src/{main => api}/java/ic2/api/tile/ExplosionWhitelist.java (100%)
 rename src/{main => api}/java/ic2/api/tile/IEnergyStorage.class (100%)
 rename src/{main => api}/java/ic2/api/tile/IEnergyStorage.java (100%)
 rename src/{main => api}/java/ic2/api/tile/IWrenchable.class (100%)
 rename src/{main => api}/java/ic2/api/tile/IWrenchable.java (100%)
 rename src/{main => api}/java/ic2/api/tile/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/tile/package-info.java (100%)
 rename src/{main => api}/java/ic2/api/util/IKeyboard.class (100%)
 rename src/{main => api}/java/ic2/api/util/IKeyboard.java (100%)
 rename src/{main => api}/java/ic2/api/util/Keys.class (100%)
 rename src/{main => api}/java/ic2/api/util/Keys.java (100%)
 rename src/{main => api}/java/ic2/api/util/package-info.class (100%)
 rename src/{main => api}/java/ic2/api/util/package-info.java (100%)
 rename src/{main => api}/java/thaumcraft/api/BlockCoordinates.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IArchitect.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IGoggles.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IRepairable.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IRepairableExtended.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IRunicArmor.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IScribeTools.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IVisDiscountGear.java (100%)
 rename src/{main => api}/java/thaumcraft/api/IWarpingGear.java (100%)
 rename src/{main => api}/java/thaumcraft/api/ItemApi.java (100%)
 rename src/{main => api}/java/thaumcraft/api/ItemRunic.java (100%)
 rename src/{main => api}/java/thaumcraft/api/ThaumcraftApi.java (100%)
 rename src/{main => api}/java/thaumcraft/api/ThaumcraftApiHelper.java (100%)
 rename src/{main => api}/java/thaumcraft/api/TileThaumcraft.java (100%)
 rename src/{main => api}/java/thaumcraft/api/WorldCoordinates.java (100%)
 rename src/{main => api}/java/thaumcraft/api/aspects/Aspect.java (100%)
 rename src/{main => api}/java/thaumcraft/api/aspects/AspectList.java (100%)
 rename src/{main => api}/java/thaumcraft/api/aspects/AspectSourceHelper.java (100%)
 rename src/{main => api}/java/thaumcraft/api/aspects/IAspectContainer.java (100%)
 rename src/{main => api}/java/thaumcraft/api/aspects/IAspectSource.java (100%)
 rename src/{main => api}/java/thaumcraft/api/aspects/IEssentiaContainerItem.java (100%)
 rename src/{main => api}/java/thaumcraft/api/aspects/IEssentiaTransport.java (100%)
 rename src/{main => api}/java/thaumcraft/api/crafting/CrucibleRecipe.java (100%)
 rename src/{main => api}/java/thaumcraft/api/crafting/IArcaneRecipe.java (100%)
 rename src/{main => api}/java/thaumcraft/api/crafting/IInfusionStabiliser.java (100%)
 rename src/{main => api}/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java (100%)
 rename src/{main => api}/java/thaumcraft/api/crafting/InfusionRecipe.java (100%)
 rename src/{main => api}/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java (100%)
 rename src/{main => api}/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java (100%)
 rename src/{main => api}/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java (100%)
 rename src/{main => api}/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java (100%)
 rename src/{main => api}/java/thaumcraft/api/entities/IEldritchMob.java (100%)
 rename src/{main => api}/java/thaumcraft/api/entities/ITaintedMob.java (100%)
 rename src/{main => api}/java/thaumcraft/api/internal/DummyInternalMethodHandler.java (100%)
 rename src/{main => api}/java/thaumcraft/api/internal/IInternalMethodHandler.java (100%)
 rename src/{main => api}/java/thaumcraft/api/internal/WeightedRandomLoot.java (100%)
 rename src/{main => api}/java/thaumcraft/api/nodes/INode.java (100%)
 rename src/{main => api}/java/thaumcraft/api/nodes/IRevealer.java (100%)
 rename src/{main => api}/java/thaumcraft/api/nodes/NodeModifier.java (100%)
 rename src/{main => api}/java/thaumcraft/api/nodes/NodeType.java (100%)
 rename src/{main => api}/java/thaumcraft/api/package-info.java (100%)
 rename src/{main => api}/java/thaumcraft/api/potions/PotionFluxTaint.java (100%)
 rename src/{main => api}/java/thaumcraft/api/potions/PotionVisExhaust.java (100%)
 rename src/{main => api}/java/thaumcraft/api/research/IScanEventHandler.java (100%)
 rename src/{main => api}/java/thaumcraft/api/research/ResearchCategories.java (100%)
 rename src/{main => api}/java/thaumcraft/api/research/ResearchCategoryList.java (100%)
 rename src/{main => api}/java/thaumcraft/api/research/ResearchItem.java (100%)
 rename src/{main => api}/java/thaumcraft/api/research/ResearchPage.java (100%)
 rename src/{main => api}/java/thaumcraft/api/research/ScanResult.java (100%)
 rename src/{main => api}/java/thaumcraft/api/visnet/TileVisNode.java (100%)
 rename src/{main => api}/java/thaumcraft/api/visnet/VisNetHandler.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/FocusUpgradeType.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/IWandRodOnUpdate.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/IWandTriggerManager.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/IWandable.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/ItemFocusBasic.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/StaffRod.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/WandCap.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/WandRod.java (100%)
 rename src/{main => api}/java/thaumcraft/api/wands/WandTriggerRegistry.java (100%)
 delete mode 100644 src/main/java/ic2/api/Direction.class
 delete mode 100644 src/main/java/ic2/api/crops/CropCard.class
 delete mode 100644 src/main/java/ic2/api/item/IKineticWindRotor.class
 delete mode 100644 src/main/java/ic2/api/item/ILatheItem.class
 delete mode 100644 src/main/java/ic2/api/network/NetworkHelper.class
 delete mode 100644 src/main/java/tombenpotter/emt/client/renderer/RenderArcher.java
 delete mode 100644 src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java
 delete mode 100644 src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java
 delete mode 100644 src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java
 delete mode 100644 src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java
 rename src/main/java/tombenpotter/emt/common/items/armor/{ItemInfusedQuantum.java => chestplates/ItemInfusedQuantumChestplate.java} (50%)
 delete mode 100644 src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java
 delete mode 100644 src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java
 delete mode 100644 src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png
 delete mode 100644 src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png

diff --git a/build.properties b/build.properties
index f5eaa0d..e81e573 100644
--- a/build.properties
+++ b/build.properties
@@ -3,5 +3,5 @@
 package_group=com.tombenpotter.emt
 mc_version=1.7.10
 forge_version=10.13.4.1481
-mod_version=1.2.0B1
+mod_version=1.2.0B3
 mod_name=ElectroMagicTools
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b0dd98c..cd50406 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
diff --git a/src/main/java/baubles/api/BaubleType.java b/src/api/java/baubles/api/BaubleType.java
similarity index 100%
rename from src/main/java/baubles/api/BaubleType.java
rename to src/api/java/baubles/api/BaubleType.java
diff --git a/src/main/java/baubles/api/BaublesApi.java b/src/api/java/baubles/api/BaublesApi.java
similarity index 100%
rename from src/main/java/baubles/api/BaublesApi.java
rename to src/api/java/baubles/api/BaublesApi.java
diff --git a/src/main/java/baubles/api/IBauble.java b/src/api/java/baubles/api/IBauble.java
similarity index 100%
rename from src/main/java/baubles/api/IBauble.java
rename to src/api/java/baubles/api/IBauble.java
diff --git a/src/main/java/baubles/api/package-info.java b/src/api/java/baubles/api/package-info.java
similarity index 100%
rename from src/main/java/baubles/api/package-info.java
rename to src/api/java/baubles/api/package-info.java
diff --git a/src/api/java/ic2/api/Direction.class b/src/api/java/ic2/api/Direction.class
new file mode 100644
index 0000000000000000000000000000000000000000..a125f3eef3de38c09d40dc19ae8a752f8e06ef6d
GIT binary patch
literal 4220
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
D;;7da

literal 0
HcmV?d00001

diff --git a/src/main/java/ic2/api/Direction.java b/src/api/java/ic2/api/Direction.java
similarity index 83%
rename from src/main/java/ic2/api/Direction.java
rename to src/api/java/ic2/api/Direction.java
index f0c687b..b550ca3 100644
--- a/src/main/java/ic2/api/Direction.java
+++ b/src/api/java/ic2/api/Direction.java
@@ -1,5 +1,8 @@
 package ic2.api;
 
+import java.util.EnumSet;
+import java.util.Set;
+
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
@@ -36,6 +39,15 @@ public enum Direction {
 	 */
 	ZP;
 
+	private Direction() {
+		int side = ordinal() / 2;
+		int sign = getSign();
+
+		xOffset = side == 0 ? sign : 0;
+		yOffset = side == 1 ? sign : 0;
+		zOffset = side == 2 ? sign : 0;
+	}
+
 	public static Direction fromSideValue(int side) {
 		return directions[(side + 2) % 6];
 	}
@@ -83,7 +95,7 @@ public enum Direction {
 
 	/**
 	 * Get the inverse of this direction (XN -> XP, XP -> XN, etc.)
-	 * 
+	 *
 	 * @return Inverse direction
 	 */
 	public Direction getInverse() {
@@ -92,7 +104,7 @@ public enum Direction {
 
 	/**
 	 * Convert this direction to a Minecraft side value.
-	 * 
+	 *
 	 * @return Minecraft side value
 	 */
 	public int toSideValue() {
@@ -112,6 +124,12 @@ public enum Direction {
 		return ForgeDirection.getOrientation(toSideValue());
 	}
 
+	public final int xOffset;
+	public final int yOffset;
+	public final int zOffset;
+
 	public static final Direction[] directions = Direction.values();
+	public static final Set<Direction> noDirections = EnumSet.noneOf(Direction.class);
+	public static final Set<Direction> allDirections = EnumSet.allOf(Direction.class);
 }
 
diff --git a/src/main/java/ic2/api/crops/BaseSeed.class b/src/api/java/ic2/api/crops/BaseSeed.class
similarity index 100%
rename from src/main/java/ic2/api/crops/BaseSeed.class
rename to src/api/java/ic2/api/crops/BaseSeed.class
diff --git a/src/main/java/ic2/api/crops/BaseSeed.java b/src/api/java/ic2/api/crops/BaseSeed.java
similarity index 100%
rename from src/main/java/ic2/api/crops/BaseSeed.java
rename to src/api/java/ic2/api/crops/BaseSeed.java
diff --git a/src/api/java/ic2/api/crops/CropCard.class b/src/api/java/ic2/api/crops/CropCard.class
new file mode 100644
index 0000000000000000000000000000000000000000..73a11770db25282b9032774b8b88b92f503f4c49
GIT binary patch
literal 6026
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
Sabeh_%R3aAK1JLBKK(ywLma^X

literal 0
HcmV?d00001

diff --git a/src/main/java/ic2/api/crops/CropCard.java b/src/api/java/ic2/api/crops/CropCard.java
similarity index 98%
rename from src/main/java/ic2/api/crops/CropCard.java
rename to src/api/java/ic2/api/crops/CropCard.java
index 091b9ad..8d97252 100644
--- a/src/main/java/ic2/api/crops/CropCard.java
+++ b/src/api/java/ic2/api/crops/CropCard.java
@@ -263,10 +263,8 @@ public abstract class CropCard {
 	 *
 	 * @return Chance to drop the gains
 	 */
-	public float dropGainChance() {
-		float base = 1F;
-		for (int i = 0; i < tier(); i++) {base*=0.95;}
-		return base;
+	public float dropGainChance() { // TODO: change to double
+		return (float) Math.pow(0.95, tier());
 	}
 
 	/**
@@ -398,7 +396,7 @@ public abstract class CropCard {
 	 */
 	public boolean isWeed(ICropTile crop) {
 		return crop.getSize() >= 2 &&
-				(crop == Crops.weed || crop.getGrowth() >= 24);
+				(crop.getCrop() == Crops.weed || crop.getGrowth() >= 24);
 	}
 
 
diff --git a/src/main/java/ic2/api/crops/Crops.class b/src/api/java/ic2/api/crops/Crops.class
similarity index 100%
rename from src/main/java/ic2/api/crops/Crops.class
rename to src/api/java/ic2/api/crops/Crops.class
diff --git a/src/main/java/ic2/api/crops/Crops.java b/src/api/java/ic2/api/crops/Crops.java
similarity index 100%
rename from src/main/java/ic2/api/crops/Crops.java
rename to src/api/java/ic2/api/crops/Crops.java
diff --git a/src/main/java/ic2/api/crops/ICropTile.class b/src/api/java/ic2/api/crops/ICropTile.class
similarity index 100%
rename from src/main/java/ic2/api/crops/ICropTile.class
rename to src/api/java/ic2/api/crops/ICropTile.class
diff --git a/src/main/java/ic2/api/crops/ICropTile.java b/src/api/java/ic2/api/crops/ICropTile.java
similarity index 100%
rename from src/main/java/ic2/api/crops/ICropTile.java
rename to src/api/java/ic2/api/crops/ICropTile.java
diff --git a/src/main/java/ic2/api/crops/package-info.class b/src/api/java/ic2/api/crops/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/crops/package-info.class
rename to src/api/java/ic2/api/crops/package-info.class
diff --git a/src/main/java/ic2/api/crops/package-info.java b/src/api/java/ic2/api/crops/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/crops/package-info.java
rename to src/api/java/ic2/api/crops/package-info.java
diff --git a/src/main/java/ic2/api/energy/EnergyNet.class b/src/api/java/ic2/api/energy/EnergyNet.class
similarity index 100%
rename from src/main/java/ic2/api/energy/EnergyNet.class
rename to src/api/java/ic2/api/energy/EnergyNet.class
diff --git a/src/main/java/ic2/api/energy/EnergyNet.java b/src/api/java/ic2/api/energy/EnergyNet.java
similarity index 100%
rename from src/main/java/ic2/api/energy/EnergyNet.java
rename to src/api/java/ic2/api/energy/EnergyNet.java
diff --git a/src/main/java/ic2/api/energy/IEnergyNet.class b/src/api/java/ic2/api/energy/IEnergyNet.class
similarity index 100%
rename from src/main/java/ic2/api/energy/IEnergyNet.class
rename to src/api/java/ic2/api/energy/IEnergyNet.class
diff --git a/src/main/java/ic2/api/energy/IEnergyNet.java b/src/api/java/ic2/api/energy/IEnergyNet.java
similarity index 100%
rename from src/main/java/ic2/api/energy/IEnergyNet.java
rename to src/api/java/ic2/api/energy/IEnergyNet.java
diff --git a/src/main/java/ic2/api/energy/NodeStats.class b/src/api/java/ic2/api/energy/NodeStats.class
similarity index 100%
rename from src/main/java/ic2/api/energy/NodeStats.class
rename to src/api/java/ic2/api/energy/NodeStats.class
diff --git a/src/main/java/ic2/api/energy/NodeStats.java b/src/api/java/ic2/api/energy/NodeStats.java
similarity index 100%
rename from src/main/java/ic2/api/energy/NodeStats.java
rename to src/api/java/ic2/api/energy/NodeStats.java
diff --git a/src/main/java/ic2/api/energy/event/EnergyTileEvent.class b/src/api/java/ic2/api/energy/event/EnergyTileEvent.class
similarity index 100%
rename from src/main/java/ic2/api/energy/event/EnergyTileEvent.class
rename to src/api/java/ic2/api/energy/event/EnergyTileEvent.class
diff --git a/src/main/java/ic2/api/energy/event/EnergyTileEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java
similarity index 100%
rename from src/main/java/ic2/api/energy/event/EnergyTileEvent.java
rename to src/api/java/ic2/api/energy/event/EnergyTileEvent.java
diff --git a/src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.class b/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.class
similarity index 100%
rename from src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.class
rename to src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.class
diff --git a/src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java
similarity index 100%
rename from src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.java
rename to src/api/java/ic2/api/energy/event/EnergyTileLoadEvent.java
diff --git a/src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.class b/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.class
similarity index 100%
rename from src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.class
rename to src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.class
diff --git a/src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
similarity index 100%
rename from src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
rename to src/api/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
diff --git a/src/main/java/ic2/api/energy/event/package-info.class b/src/api/java/ic2/api/energy/event/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/energy/event/package-info.class
rename to src/api/java/ic2/api/energy/event/package-info.class
diff --git a/src/main/java/ic2/api/energy/event/package-info.java b/src/api/java/ic2/api/energy/event/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/energy/event/package-info.java
rename to src/api/java/ic2/api/energy/event/package-info.java
diff --git a/src/main/java/ic2/api/energy/package-info.class b/src/api/java/ic2/api/energy/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/energy/package-info.class
rename to src/api/java/ic2/api/energy/package-info.class
diff --git a/src/main/java/ic2/api/energy/package-info.java b/src/api/java/ic2/api/energy/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/energy/package-info.java
rename to src/api/java/ic2/api/energy/package-info.java
diff --git a/src/main/java/ic2/api/energy/prefab/BasicSink.class b/src/api/java/ic2/api/energy/prefab/BasicSink.class
similarity index 100%
rename from src/main/java/ic2/api/energy/prefab/BasicSink.class
rename to src/api/java/ic2/api/energy/prefab/BasicSink.class
diff --git a/src/main/java/ic2/api/energy/prefab/BasicSink.java b/src/api/java/ic2/api/energy/prefab/BasicSink.java
similarity index 100%
rename from src/main/java/ic2/api/energy/prefab/BasicSink.java
rename to src/api/java/ic2/api/energy/prefab/BasicSink.java
diff --git a/src/main/java/ic2/api/energy/prefab/BasicSource.class b/src/api/java/ic2/api/energy/prefab/BasicSource.class
similarity index 100%
rename from src/main/java/ic2/api/energy/prefab/BasicSource.class
rename to src/api/java/ic2/api/energy/prefab/BasicSource.class
diff --git a/src/main/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java
similarity index 100%
rename from src/main/java/ic2/api/energy/prefab/BasicSource.java
rename to src/api/java/ic2/api/energy/prefab/BasicSource.java
diff --git a/src/main/java/ic2/api/energy/prefab/package-info.class b/src/api/java/ic2/api/energy/prefab/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/energy/prefab/package-info.class
rename to src/api/java/ic2/api/energy/prefab/package-info.class
diff --git a/src/main/java/ic2/api/energy/prefab/package-info.java b/src/api/java/ic2/api/energy/prefab/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/energy/prefab/package-info.java
rename to src/api/java/ic2/api/energy/prefab/package-info.java
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyAcceptor.class b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyAcceptor.class
rename to src/api/java/ic2/api/energy/tile/IEnergyAcceptor.class
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyAcceptor.java b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyAcceptor.java
rename to src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyConductor.class b/src/api/java/ic2/api/energy/tile/IEnergyConductor.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyConductor.class
rename to src/api/java/ic2/api/energy/tile/IEnergyConductor.class
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyConductor.java b/src/api/java/ic2/api/energy/tile/IEnergyConductor.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyConductor.java
rename to src/api/java/ic2/api/energy/tile/IEnergyConductor.java
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyEmitter.class b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyEmitter.class
rename to src/api/java/ic2/api/energy/tile/IEnergyEmitter.class
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyEmitter.java b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyEmitter.java
rename to src/api/java/ic2/api/energy/tile/IEnergyEmitter.java
diff --git a/src/main/java/ic2/api/energy/tile/IEnergySink.class b/src/api/java/ic2/api/energy/tile/IEnergySink.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergySink.class
rename to src/api/java/ic2/api/energy/tile/IEnergySink.class
diff --git a/src/main/java/ic2/api/energy/tile/IEnergySink.java b/src/api/java/ic2/api/energy/tile/IEnergySink.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergySink.java
rename to src/api/java/ic2/api/energy/tile/IEnergySink.java
diff --git a/src/main/java/ic2/api/energy/tile/IEnergySource.class b/src/api/java/ic2/api/energy/tile/IEnergySource.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergySource.class
rename to src/api/java/ic2/api/energy/tile/IEnergySource.class
diff --git a/src/main/java/ic2/api/energy/tile/IEnergySource.java b/src/api/java/ic2/api/energy/tile/IEnergySource.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergySource.java
rename to src/api/java/ic2/api/energy/tile/IEnergySource.java
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyTile.class b/src/api/java/ic2/api/energy/tile/IEnergyTile.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyTile.class
rename to src/api/java/ic2/api/energy/tile/IEnergyTile.class
diff --git a/src/main/java/ic2/api/energy/tile/IEnergyTile.java b/src/api/java/ic2/api/energy/tile/IEnergyTile.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IEnergyTile.java
rename to src/api/java/ic2/api/energy/tile/IEnergyTile.java
diff --git a/src/main/java/ic2/api/energy/tile/IHeatSource.class b/src/api/java/ic2/api/energy/tile/IHeatSource.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IHeatSource.class
rename to src/api/java/ic2/api/energy/tile/IHeatSource.class
diff --git a/src/main/java/ic2/api/energy/tile/IHeatSource.java b/src/api/java/ic2/api/energy/tile/IHeatSource.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IHeatSource.java
rename to src/api/java/ic2/api/energy/tile/IHeatSource.java
diff --git a/src/main/java/ic2/api/energy/tile/IKineticSource.class b/src/api/java/ic2/api/energy/tile/IKineticSource.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IKineticSource.class
rename to src/api/java/ic2/api/energy/tile/IKineticSource.class
diff --git a/src/main/java/ic2/api/energy/tile/IKineticSource.java b/src/api/java/ic2/api/energy/tile/IKineticSource.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IKineticSource.java
rename to src/api/java/ic2/api/energy/tile/IKineticSource.java
diff --git a/src/main/java/ic2/api/energy/tile/IMetaDelegate.class b/src/api/java/ic2/api/energy/tile/IMetaDelegate.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IMetaDelegate.class
rename to src/api/java/ic2/api/energy/tile/IMetaDelegate.class
diff --git a/src/main/java/ic2/api/energy/tile/IMetaDelegate.java b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/IMetaDelegate.java
rename to src/api/java/ic2/api/energy/tile/IMetaDelegate.java
diff --git a/src/main/java/ic2/api/energy/tile/package-info.class b/src/api/java/ic2/api/energy/tile/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/package-info.class
rename to src/api/java/ic2/api/energy/tile/package-info.class
diff --git a/src/main/java/ic2/api/energy/tile/package-info.java b/src/api/java/ic2/api/energy/tile/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/energy/tile/package-info.java
rename to src/api/java/ic2/api/energy/tile/package-info.java
diff --git a/src/main/java/ic2/api/energy/usage.txt b/src/api/java/ic2/api/energy/usage.txt
similarity index 100%
rename from src/main/java/ic2/api/energy/usage.txt
rename to src/api/java/ic2/api/energy/usage.txt
diff --git a/src/main/java/ic2/api/event/ExplosionEvent.class b/src/api/java/ic2/api/event/ExplosionEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/ExplosionEvent.class
rename to src/api/java/ic2/api/event/ExplosionEvent.class
diff --git a/src/main/java/ic2/api/event/ExplosionEvent.java b/src/api/java/ic2/api/event/ExplosionEvent.java
similarity index 100%
rename from src/main/java/ic2/api/event/ExplosionEvent.java
rename to src/api/java/ic2/api/event/ExplosionEvent.java
diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class
rename to src/api/java/ic2/api/event/LaserEvent$LaserExplodesEvent.class
diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class
rename to src/api/java/ic2/api/event/LaserEvent$LaserHitsBlockEvent.class
diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class
rename to src/api/java/ic2/api/event/LaserEvent$LaserHitsEntityEvent.class
diff --git a/src/main/java/ic2/api/event/LaserEvent$LaserShootEvent.class b/src/api/java/ic2/api/event/LaserEvent$LaserShootEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/LaserEvent$LaserShootEvent.class
rename to src/api/java/ic2/api/event/LaserEvent$LaserShootEvent.class
diff --git a/src/main/java/ic2/api/event/LaserEvent.class b/src/api/java/ic2/api/event/LaserEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/LaserEvent.class
rename to src/api/java/ic2/api/event/LaserEvent.class
diff --git a/src/main/java/ic2/api/event/LaserEvent.java b/src/api/java/ic2/api/event/LaserEvent.java
similarity index 100%
rename from src/main/java/ic2/api/event/LaserEvent.java
rename to src/api/java/ic2/api/event/LaserEvent.java
diff --git a/src/main/java/ic2/api/event/PaintEvent.class b/src/api/java/ic2/api/event/PaintEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/PaintEvent.class
rename to src/api/java/ic2/api/event/PaintEvent.class
diff --git a/src/main/java/ic2/api/event/PaintEvent.java b/src/api/java/ic2/api/event/PaintEvent.java
similarity index 100%
rename from src/main/java/ic2/api/event/PaintEvent.java
rename to src/api/java/ic2/api/event/PaintEvent.java
diff --git a/src/main/java/ic2/api/event/RetextureEvent.class b/src/api/java/ic2/api/event/RetextureEvent.class
similarity index 100%
rename from src/main/java/ic2/api/event/RetextureEvent.class
rename to src/api/java/ic2/api/event/RetextureEvent.class
diff --git a/src/main/java/ic2/api/event/RetextureEvent.java b/src/api/java/ic2/api/event/RetextureEvent.java
similarity index 100%
rename from src/main/java/ic2/api/event/RetextureEvent.java
rename to src/api/java/ic2/api/event/RetextureEvent.java
diff --git a/src/main/java/ic2/api/event/package-info.class b/src/api/java/ic2/api/event/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/event/package-info.class
rename to src/api/java/ic2/api/event/package-info.class
diff --git a/src/main/java/ic2/api/event/package-info.java b/src/api/java/ic2/api/event/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/event/package-info.java
rename to src/api/java/ic2/api/event/package-info.java
diff --git a/src/main/java/ic2/api/info/IEnergyValueProvider.class b/src/api/java/ic2/api/info/IEnergyValueProvider.class
similarity index 100%
rename from src/main/java/ic2/api/info/IEnergyValueProvider.class
rename to src/api/java/ic2/api/info/IEnergyValueProvider.class
diff --git a/src/main/java/ic2/api/info/IEnergyValueProvider.java b/src/api/java/ic2/api/info/IEnergyValueProvider.java
similarity index 100%
rename from src/main/java/ic2/api/info/IEnergyValueProvider.java
rename to src/api/java/ic2/api/info/IEnergyValueProvider.java
diff --git a/src/main/java/ic2/api/info/IFuelValueProvider.class b/src/api/java/ic2/api/info/IFuelValueProvider.class
similarity index 100%
rename from src/main/java/ic2/api/info/IFuelValueProvider.class
rename to src/api/java/ic2/api/info/IFuelValueProvider.class
diff --git a/src/main/java/ic2/api/info/IFuelValueProvider.java b/src/api/java/ic2/api/info/IFuelValueProvider.java
similarity index 100%
rename from src/main/java/ic2/api/info/IFuelValueProvider.java
rename to src/api/java/ic2/api/info/IFuelValueProvider.java
diff --git a/src/main/java/ic2/api/info/Info.class b/src/api/java/ic2/api/info/Info.class
similarity index 100%
rename from src/main/java/ic2/api/info/Info.class
rename to src/api/java/ic2/api/info/Info.class
diff --git a/src/main/java/ic2/api/info/Info.java b/src/api/java/ic2/api/info/Info.java
similarity index 100%
rename from src/main/java/ic2/api/info/Info.java
rename to src/api/java/ic2/api/info/Info.java
diff --git a/src/main/java/ic2/api/info/package-info.class b/src/api/java/ic2/api/info/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/info/package-info.class
rename to src/api/java/ic2/api/info/package-info.class
diff --git a/src/main/java/ic2/api/info/package-info.java b/src/api/java/ic2/api/info/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/info/package-info.java
rename to src/api/java/ic2/api/info/package-info.java
diff --git a/src/main/java/ic2/api/item/ElectricItem.class b/src/api/java/ic2/api/item/ElectricItem.class
similarity index 100%
rename from src/main/java/ic2/api/item/ElectricItem.class
rename to src/api/java/ic2/api/item/ElectricItem.class
diff --git a/src/main/java/ic2/api/item/ElectricItem.java b/src/api/java/ic2/api/item/ElectricItem.java
similarity index 100%
rename from src/main/java/ic2/api/item/ElectricItem.java
rename to src/api/java/ic2/api/item/ElectricItem.java
diff --git a/src/main/java/ic2/api/item/IBackupElectricItemManager.class b/src/api/java/ic2/api/item/IBackupElectricItemManager.class
similarity index 100%
rename from src/main/java/ic2/api/item/IBackupElectricItemManager.class
rename to src/api/java/ic2/api/item/IBackupElectricItemManager.class
diff --git a/src/main/java/ic2/api/item/IBackupElectricItemManager.java b/src/api/java/ic2/api/item/IBackupElectricItemManager.java
similarity index 100%
rename from src/main/java/ic2/api/item/IBackupElectricItemManager.java
rename to src/api/java/ic2/api/item/IBackupElectricItemManager.java
diff --git a/src/main/java/ic2/api/item/IBlockCuttingBlade.class b/src/api/java/ic2/api/item/IBlockCuttingBlade.class
similarity index 100%
rename from src/main/java/ic2/api/item/IBlockCuttingBlade.class
rename to src/api/java/ic2/api/item/IBlockCuttingBlade.class
diff --git a/src/main/java/ic2/api/item/IBlockCuttingBlade.java b/src/api/java/ic2/api/item/IBlockCuttingBlade.java
similarity index 100%
rename from src/main/java/ic2/api/item/IBlockCuttingBlade.java
rename to src/api/java/ic2/api/item/IBlockCuttingBlade.java
diff --git a/src/main/java/ic2/api/item/IBoxable.class b/src/api/java/ic2/api/item/IBoxable.class
similarity index 100%
rename from src/main/java/ic2/api/item/IBoxable.class
rename to src/api/java/ic2/api/item/IBoxable.class
diff --git a/src/main/java/ic2/api/item/IBoxable.java b/src/api/java/ic2/api/item/IBoxable.java
similarity index 100%
rename from src/main/java/ic2/api/item/IBoxable.java
rename to src/api/java/ic2/api/item/IBoxable.java
diff --git a/src/main/java/ic2/api/item/IC2Items.class b/src/api/java/ic2/api/item/IC2Items.class
similarity index 100%
rename from src/main/java/ic2/api/item/IC2Items.class
rename to src/api/java/ic2/api/item/IC2Items.class
diff --git a/src/main/java/ic2/api/item/IC2Items.java b/src/api/java/ic2/api/item/IC2Items.java
similarity index 100%
rename from src/main/java/ic2/api/item/IC2Items.java
rename to src/api/java/ic2/api/item/IC2Items.java
diff --git a/src/main/java/ic2/api/item/ICustomDamageItem.class b/src/api/java/ic2/api/item/ICustomDamageItem.class
similarity index 100%
rename from src/main/java/ic2/api/item/ICustomDamageItem.class
rename to src/api/java/ic2/api/item/ICustomDamageItem.class
diff --git a/src/main/java/ic2/api/item/ICustomDamageItem.java b/src/api/java/ic2/api/item/ICustomDamageItem.java
similarity index 100%
rename from src/main/java/ic2/api/item/ICustomDamageItem.java
rename to src/api/java/ic2/api/item/ICustomDamageItem.java
diff --git a/src/main/java/ic2/api/item/IDebuggable.class b/src/api/java/ic2/api/item/IDebuggable.class
similarity index 100%
rename from src/main/java/ic2/api/item/IDebuggable.class
rename to src/api/java/ic2/api/item/IDebuggable.class
diff --git a/src/main/java/ic2/api/item/IDebuggable.java b/src/api/java/ic2/api/item/IDebuggable.java
similarity index 100%
rename from src/main/java/ic2/api/item/IDebuggable.java
rename to src/api/java/ic2/api/item/IDebuggable.java
diff --git a/src/main/java/ic2/api/item/IElectricItem.class b/src/api/java/ic2/api/item/IElectricItem.class
similarity index 100%
rename from src/main/java/ic2/api/item/IElectricItem.class
rename to src/api/java/ic2/api/item/IElectricItem.class
diff --git a/src/main/java/ic2/api/item/IElectricItem.java b/src/api/java/ic2/api/item/IElectricItem.java
similarity index 100%
rename from src/main/java/ic2/api/item/IElectricItem.java
rename to src/api/java/ic2/api/item/IElectricItem.java
diff --git a/src/main/java/ic2/api/item/IElectricItemManager.class b/src/api/java/ic2/api/item/IElectricItemManager.class
similarity index 100%
rename from src/main/java/ic2/api/item/IElectricItemManager.class
rename to src/api/java/ic2/api/item/IElectricItemManager.class
diff --git a/src/main/java/ic2/api/item/IElectricItemManager.java b/src/api/java/ic2/api/item/IElectricItemManager.java
similarity index 100%
rename from src/main/java/ic2/api/item/IElectricItemManager.java
rename to src/api/java/ic2/api/item/IElectricItemManager.java
diff --git a/src/main/java/ic2/api/item/IItemHudInfo.class b/src/api/java/ic2/api/item/IItemHudInfo.class
similarity index 100%
rename from src/main/java/ic2/api/item/IItemHudInfo.class
rename to src/api/java/ic2/api/item/IItemHudInfo.class
diff --git a/src/main/java/ic2/api/item/IItemHudInfo.java b/src/api/java/ic2/api/item/IItemHudInfo.java
similarity index 100%
rename from src/main/java/ic2/api/item/IItemHudInfo.java
rename to src/api/java/ic2/api/item/IItemHudInfo.java
diff --git a/src/api/java/ic2/api/item/IKineticRotor$GearboxType.class b/src/api/java/ic2/api/item/IKineticRotor$GearboxType.class
new file mode 100644
index 0000000000000000000000000000000000000000..3e3e8df7c6d8723e9b526d24f7bfe7d8d895b7aa
GIT binary patch
literal 1131
zcmb7DZEw<06n-u(6iUY!FdaBwrZ{;~5R@-M7M3{;k+5VS%i^a}D|RXEQp%$LN?GEJ
zMzhcUDC4;uaV2Vkx5+&@_q;sMdFhXzU%msVq85ROO&Rx)laQ29kfET+ulr#v$z*)M
zJxXD$a9Nh{kRf=m-P_$~h(6a<XJEhUy+76&l$K@b&W@>$$NHEd*EY0jSv@w&hO3Xt
ztrv!+yN0%JyS9_{1=bnFgI4D$gOu%Ww_omd8S<|d4-TEE=7a+lbN>@2?%1!1^m3bM
zbta>M?)21wNiUL@Z|@C5BiBAsPt>xhTElYJbqs4*&o53a(Y7_!?5mE!6VI}XmO3Jk
z#GjcNLJh+*+%1MHe*tdg`_w4+twEJWy2j8_-HAh)gd8`78=5%_e&S2LYfVOtMHz3=
zB;>9=aWwsz!8?(dn^}qXLP3IWNm4-tRSAz6HW!<+f;Bu=a2+>h*An6iRuE^1T{fBX
zrS;NG+aml_F7K;lZ*Zh*E^*BK8<C;rZ=JV`bzhF(L!5`KH!HN;3jGj5GYw(}kR)<I
zJi{v{i--tPSOraowA&>4k*8pv5IBeMfi#AzbcZ}!lKj_@p83}h@Lr=yh=tDxo<rmT
zfw_PTy(kxMxQ2DlP7Nb34q1UfA0QQq>t_gk^vr&|%Ww%dId|Ohd^Qj!z8f<p9jb(%
z(pQLw2}w9Z_!JROkws652EUO>n9`aZic>_pr(hiIqPmzzB1K(VMTR;f%uwziOFjYI
P#WG2myhY>@Yo>nzInDdR

literal 0
HcmV?d00001

diff --git a/src/api/java/ic2/api/item/IKineticRotor.class b/src/api/java/ic2/api/item/IKineticRotor.class
new file mode 100644
index 0000000000000000000000000000000000000000..4bba1ebdefafe46fe56315c6483d6256a40d8114
GIT binary patch
literal 590
zcma)3O-}+b6r3Wm%9n_8(3^=da&Z%`Tr>)1BgO<sOuUuyz~a&+-G_m{=D{D}k22PE
z4`@R0&^O8S&Aiv?$LHHSfCg$FsvZtJ910X}N!mfQ=r3m^Pz;PAdmYL+rr2GMiEp%=
z5|b4;Iqw)^f2s{BD@W{Wrl}ve(qpM!n)N`S<`mtCBiki2B-^J2&#g0VZPNa+p0f`9
zF2&K@D(XZ^vW`qspyd2pqmfpcj9UI<r?x=VY3{Xo)MnUYOJ>Z^DJd7f$+C{Gl%g5a
z@F$O8!`dCK8or$AG>SVH4QrJIaJmv~v;HKI?<J3E>(J#<4OV+ECh}DZ9Itm1sC@VM
zp)_OvVK5=Z0%z;{SEuI$1TyaDfm~J~2M=(#gWUx4C?r@+`BI8y>^VgSm89-t+hN{0
KZMl=ZJo*CNd#hsr

literal 0
HcmV?d00001

diff --git a/src/main/java/ic2/api/item/IKineticWindRotor.java b/src/api/java/ic2/api/item/IKineticRotor.java
similarity index 68%
rename from src/main/java/ic2/api/item/IKineticWindRotor.java
rename to src/api/java/ic2/api/item/IKineticRotor.java
index de696e3..a61d162 100644
--- a/src/main/java/ic2/api/item/IKineticWindRotor.java
+++ b/src/api/java/ic2/api/item/IKineticRotor.java
@@ -3,7 +3,7 @@ package ic2.api.item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
-public interface IKineticWindRotor {
+public interface IKineticRotor {
 	int getDiameter(ItemStack stack);
 
 	ResourceLocation getRotorRenderTexture(ItemStack stack);
@@ -13,4 +13,11 @@ public interface IKineticWindRotor {
 	int getMinWindStrength(ItemStack stack);
 
 	int getMaxWindStrength(ItemStack stack);
+
+	boolean isAcceptedType(ItemStack stack, GearboxType type);
+
+	public static enum GearboxType  {
+		WATER,
+		WIND,
+	}
 }
diff --git a/src/api/java/ic2/api/item/ILatheItem$ILatheTool.class b/src/api/java/ic2/api/item/ILatheItem$ILatheTool.class
new file mode 100644
index 0000000000000000000000000000000000000000..46efc5019384e06cd843c83f8faba1b637ff9cce
GIT binary patch
literal 294
zcmY*U%T5A85Ul30BMXW*ZzdWKa$yp#93h5HNIc*Vv_rcN?9P&%!H@Ic2k=qG;SnN-
zuI^4(S9R}xzkdLX&{yav^c1cM-CV+q>!lO#2@lV6Cqb9iiK+P`Xd9%|S%gJkvmOsJ
zLb|B7wUHNF2%(?NIef~VF<kK%E8Gwstr=<F*wglz@pL4=RaFsX{x`kMIjJWFdoS^f
z+r5-7*yZ~5eI+Ik?k_bbTOX=&$|dIqbHd#v;cS`^2#pxc_&c=-Ewp3RKypBZZp>+%
J6RwaZoj=E$OzZ#v

literal 0
HcmV?d00001

diff --git a/src/api/java/ic2/api/item/ILatheItem.class b/src/api/java/ic2/api/item/ILatheItem.class
new file mode 100644
index 0000000000000000000000000000000000000000..b6a25ef0f74f8b9d24dda7a6f229c2d282cecaaf
GIT binary patch
literal 775
zcma)4%T60H6g}pV34stwp}dixT{N3oV#@-d2-J~AjYJ~4=*l=3V(Rfk9-GInvFHc%
zqbhDDRFx`~bYUOKKIh!y>-+Q9(+>bg*h{dTU?;(@KqJjm7*f9|tiV$09Qlq_Wl5z#
z{f5F<GYCV0gO8b`AamnLdvzV836#r}w_Z^C`*AxJXfeGLy(bs=Fp$9EG}Skj)l2%#
ze?NtvrtM3CCfDi4Fp6PZU*Ke#s{MNQN%DzfXQ-V1kK}3loO{PX`t%T@XT{l+6n}?^
z!B}}gWf8rmtk5c$!W|22T|^g5PM4-MSC&qlE4Z0_#~*T->CwH+i$N)`b1OYr6`dZE
zmpwC}uCtG9Fn_0P<Usqcl9^cRWa-(LzQ7{C<FoPuM<o|&^r}eb#<EFkG9Kebf4Wt7
zN?^n2BdJE_Wdf?{nf$}bm>{ikH?n(mOFD4ie~>@?nYx;QzzokNkj!x?BmiR_3l%o7
vSm6?y6)vMy;R@ccZk1I{#<#rI2<v#q(v7hNTW(hS7UmfnOqk_0S6g@nV^`g$

literal 0
HcmV?d00001

diff --git a/src/main/java/ic2/api/item/ILatheItem.java b/src/api/java/ic2/api/item/ILatheItem.java
similarity index 61%
rename from src/main/java/ic2/api/item/ILatheItem.java
rename to src/api/java/ic2/api/item/ILatheItem.java
index 2baffc8..45988c4 100644
--- a/src/main/java/ic2/api/item/ILatheItem.java
+++ b/src/api/java/ic2/api/item/ILatheItem.java
@@ -6,6 +6,9 @@ import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+/**
+ * Interface used for Items that can be processed in the Turning Table
+ */
 public interface ILatheItem {
 
 	/**
@@ -44,4 +47,24 @@ public interface ILatheItem {
 	@SideOnly(Side.CLIENT)
 	ResourceLocation getTexture(ItemStack stack);
 
+	/**
+	 * This is similar to the Block HarvestLevel. Requires a different tool for a different hardness
+	 * for ex. the Iron Turning Blank has a Hardness  of 2 (Like Iron Ore (Harvest Level)).
+	 * In this case however it requires a Tool hardness of one above (3)
+	 */
+	int getHardness(ItemStack stack);
+
+	/**
+	 * Interface used for Tools that can be used to modify {@link ILatheItem}
+	 */
+	public static interface ILatheTool extends ICustomDamageItem {
+
+		/**
+		 * This is similar to the Tool HarvestLevel. Requires a different tool for a different hardness
+		 * for ex. the Iron Turning Blank has a Hardness  of 2 (Like Iron Ore (Harvest Level)).
+		 * The tool requires a hardness of one level above (in this case 3)
+		 */
+		int getHardness(ItemStack stack);
+	}
+
 }
diff --git a/src/main/java/ic2/api/item/IMetalArmor.class b/src/api/java/ic2/api/item/IMetalArmor.class
similarity index 100%
rename from src/main/java/ic2/api/item/IMetalArmor.class
rename to src/api/java/ic2/api/item/IMetalArmor.class
diff --git a/src/main/java/ic2/api/item/IMetalArmor.java b/src/api/java/ic2/api/item/IMetalArmor.java
similarity index 100%
rename from src/main/java/ic2/api/item/IMetalArmor.java
rename to src/api/java/ic2/api/item/IMetalArmor.java
diff --git a/src/main/java/ic2/api/item/ISpecialElectricItem.class b/src/api/java/ic2/api/item/ISpecialElectricItem.class
similarity index 100%
rename from src/main/java/ic2/api/item/ISpecialElectricItem.class
rename to src/api/java/ic2/api/item/ISpecialElectricItem.class
diff --git a/src/main/java/ic2/api/item/ISpecialElectricItem.java b/src/api/java/ic2/api/item/ISpecialElectricItem.java
similarity index 100%
rename from src/main/java/ic2/api/item/ISpecialElectricItem.java
rename to src/api/java/ic2/api/item/ISpecialElectricItem.java
diff --git a/src/main/java/ic2/api/item/ITerraformingBP.class b/src/api/java/ic2/api/item/ITerraformingBP.class
similarity index 100%
rename from src/main/java/ic2/api/item/ITerraformingBP.class
rename to src/api/java/ic2/api/item/ITerraformingBP.class
diff --git a/src/main/java/ic2/api/item/ITerraformingBP.java b/src/api/java/ic2/api/item/ITerraformingBP.java
similarity index 100%
rename from src/main/java/ic2/api/item/ITerraformingBP.java
rename to src/api/java/ic2/api/item/ITerraformingBP.java
diff --git a/src/main/java/ic2/api/item/ItemWrapper.class b/src/api/java/ic2/api/item/ItemWrapper.class
similarity index 100%
rename from src/main/java/ic2/api/item/ItemWrapper.class
rename to src/api/java/ic2/api/item/ItemWrapper.class
diff --git a/src/main/java/ic2/api/item/ItemWrapper.java b/src/api/java/ic2/api/item/ItemWrapper.java
similarity index 100%
rename from src/main/java/ic2/api/item/ItemWrapper.java
rename to src/api/java/ic2/api/item/ItemWrapper.java
diff --git a/src/main/java/ic2/api/item/package-info.class b/src/api/java/ic2/api/item/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/item/package-info.class
rename to src/api/java/ic2/api/item/package-info.class
diff --git a/src/main/java/ic2/api/item/package-info.java b/src/api/java/ic2/api/item/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/item/package-info.java
rename to src/api/java/ic2/api/item/package-info.java
diff --git a/src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.class b/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.class
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.class
rename to src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.class
diff --git a/src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.java b/src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.java
rename to src/api/java/ic2/api/network/INetworkClientTileEntityEventListener.java
diff --git a/src/main/java/ic2/api/network/INetworkDataProvider.class b/src/api/java/ic2/api/network/INetworkDataProvider.class
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkDataProvider.class
rename to src/api/java/ic2/api/network/INetworkDataProvider.class
diff --git a/src/main/java/ic2/api/network/INetworkDataProvider.java b/src/api/java/ic2/api/network/INetworkDataProvider.java
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkDataProvider.java
rename to src/api/java/ic2/api/network/INetworkDataProvider.java
diff --git a/src/main/java/ic2/api/network/INetworkItemEventListener.class b/src/api/java/ic2/api/network/INetworkItemEventListener.class
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkItemEventListener.class
rename to src/api/java/ic2/api/network/INetworkItemEventListener.class
diff --git a/src/main/java/ic2/api/network/INetworkItemEventListener.java b/src/api/java/ic2/api/network/INetworkItemEventListener.java
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkItemEventListener.java
rename to src/api/java/ic2/api/network/INetworkItemEventListener.java
diff --git a/src/main/java/ic2/api/network/INetworkTileEntityEventListener.class b/src/api/java/ic2/api/network/INetworkTileEntityEventListener.class
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkTileEntityEventListener.class
rename to src/api/java/ic2/api/network/INetworkTileEntityEventListener.class
diff --git a/src/main/java/ic2/api/network/INetworkTileEntityEventListener.java b/src/api/java/ic2/api/network/INetworkTileEntityEventListener.java
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkTileEntityEventListener.java
rename to src/api/java/ic2/api/network/INetworkTileEntityEventListener.java
diff --git a/src/main/java/ic2/api/network/INetworkUpdateListener.class b/src/api/java/ic2/api/network/INetworkUpdateListener.class
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkUpdateListener.class
rename to src/api/java/ic2/api/network/INetworkUpdateListener.class
diff --git a/src/main/java/ic2/api/network/INetworkUpdateListener.java b/src/api/java/ic2/api/network/INetworkUpdateListener.java
similarity index 100%
rename from src/main/java/ic2/api/network/INetworkUpdateListener.java
rename to src/api/java/ic2/api/network/INetworkUpdateListener.java
diff --git a/src/api/java/ic2/api/network/NetworkHelper.class b/src/api/java/ic2/api/network/NetworkHelper.class
new file mode 100644
index 0000000000000000000000000000000000000000..73ba5692b9aa16da5c33d34fdcb1556fad20db08
GIT binary patch
literal 4263
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
BIgS7T

literal 0
HcmV?d00001

diff --git a/src/main/java/ic2/api/network/NetworkHelper.java b/src/api/java/ic2/api/network/NetworkHelper.java
similarity index 97%
rename from src/main/java/ic2/api/network/NetworkHelper.java
rename to src/api/java/ic2/api/network/NetworkHelper.java
index 5f9138d..a91d03a 100644
--- a/src/main/java/ic2/api/network/NetworkHelper.java
+++ b/src/api/java/ic2/api/network/NetworkHelper.java
@@ -178,7 +178,7 @@ public final class NetworkHelper {
 	 */
 	private static Object getInstance() {
 		try {
-			return Class.forName(getPackage() + ".core.IC2").getDeclaredField("network").get(null);
+			return Class.forName(getPackage() + ".core.util.SideGateway").getMethod("get").invoke(Class.forName(getPackage() + ".core.IC2").getDeclaredField("network").get(null));
 		} catch (Throwable e) {
 			throw new RuntimeException(e);
 		}
diff --git a/src/main/java/ic2/api/network/package-info.class b/src/api/java/ic2/api/network/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/network/package-info.class
rename to src/api/java/ic2/api/network/package-info.class
diff --git a/src/main/java/ic2/api/network/package-info.java b/src/api/java/ic2/api/network/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/network/package-info.java
rename to src/api/java/ic2/api/network/package-info.java
diff --git a/src/main/java/ic2/api/package-info.class b/src/api/java/ic2/api/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/package-info.class
rename to src/api/java/ic2/api/package-info.class
diff --git a/src/main/java/ic2/api/package-info.java b/src/api/java/ic2/api/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/package-info.java
rename to src/api/java/ic2/api/package-info.java
diff --git a/src/main/java/ic2/api/reactor/IReactor.class b/src/api/java/ic2/api/reactor/IReactor.class
similarity index 100%
rename from src/main/java/ic2/api/reactor/IReactor.class
rename to src/api/java/ic2/api/reactor/IReactor.class
diff --git a/src/main/java/ic2/api/reactor/IReactor.java b/src/api/java/ic2/api/reactor/IReactor.java
similarity index 100%
rename from src/main/java/ic2/api/reactor/IReactor.java
rename to src/api/java/ic2/api/reactor/IReactor.java
diff --git a/src/main/java/ic2/api/reactor/IReactorChamber.class b/src/api/java/ic2/api/reactor/IReactorChamber.class
similarity index 100%
rename from src/main/java/ic2/api/reactor/IReactorChamber.class
rename to src/api/java/ic2/api/reactor/IReactorChamber.class
diff --git a/src/main/java/ic2/api/reactor/IReactorChamber.java b/src/api/java/ic2/api/reactor/IReactorChamber.java
similarity index 100%
rename from src/main/java/ic2/api/reactor/IReactorChamber.java
rename to src/api/java/ic2/api/reactor/IReactorChamber.java
diff --git a/src/main/java/ic2/api/reactor/IReactorComponent.class b/src/api/java/ic2/api/reactor/IReactorComponent.class
similarity index 100%
rename from src/main/java/ic2/api/reactor/IReactorComponent.class
rename to src/api/java/ic2/api/reactor/IReactorComponent.class
diff --git a/src/main/java/ic2/api/reactor/IReactorComponent.java b/src/api/java/ic2/api/reactor/IReactorComponent.java
similarity index 100%
rename from src/main/java/ic2/api/reactor/IReactorComponent.java
rename to src/api/java/ic2/api/reactor/IReactorComponent.java
diff --git a/src/main/java/ic2/api/reactor/package-info.class b/src/api/java/ic2/api/reactor/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/reactor/package-info.class
rename to src/api/java/ic2/api/reactor/package-info.class
diff --git a/src/main/java/ic2/api/reactor/package-info.java b/src/api/java/ic2/api/reactor/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/reactor/package-info.java
rename to src/api/java/ic2/api/reactor/package-info.java
diff --git a/src/main/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class
rename to src/api/java/ic2/api/recipe/ICannerBottleRecipeManager$Input.class
diff --git a/src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.class b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.class
rename to src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.class
diff --git a/src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.java
rename to src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java
diff --git a/src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class
rename to src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager$Input.class
diff --git a/src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.class b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.class
rename to src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.class
diff --git a/src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
rename to src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
diff --git a/src/main/java/ic2/api/recipe/ICraftingRecipeManager.class b/src/api/java/ic2/api/recipe/ICraftingRecipeManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICraftingRecipeManager.class
rename to src/api/java/ic2/api/recipe/ICraftingRecipeManager.class
diff --git a/src/main/java/ic2/api/recipe/ICraftingRecipeManager.java b/src/api/java/ic2/api/recipe/ICraftingRecipeManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/ICraftingRecipeManager.java
rename to src/api/java/ic2/api/recipe/ICraftingRecipeManager.java
diff --git a/src/main/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class b/src/api/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class
rename to src/api/java/ic2/api/recipe/IFluidHeatManager$BurnProperty.class
diff --git a/src/main/java/ic2/api/recipe/IFluidHeatManager.class b/src/api/java/ic2/api/recipe/IFluidHeatManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IFluidHeatManager.class
rename to src/api/java/ic2/api/recipe/IFluidHeatManager.class
diff --git a/src/main/java/ic2/api/recipe/IFluidHeatManager.java b/src/api/java/ic2/api/recipe/IFluidHeatManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/IFluidHeatManager.java
rename to src/api/java/ic2/api/recipe/IFluidHeatManager.java
diff --git a/src/main/java/ic2/api/recipe/ILiquidAcceptManager.class b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ILiquidAcceptManager.class
rename to src/api/java/ic2/api/recipe/ILiquidAcceptManager.class
diff --git a/src/main/java/ic2/api/recipe/ILiquidAcceptManager.java b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/ILiquidAcceptManager.java
rename to src/api/java/ic2/api/recipe/ILiquidAcceptManager.java
diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager$HeatExchangeProperty.class b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager$HeatExchangeProperty.class
new file mode 100644
index 0000000000000000000000000000000000000000..1934b96004dc4b3abb8092f21bf6ee1f8324f2d2
GIT binary patch
literal 662
zcmbtR+e*Vg5Ivh#V{5cm?+OYEwSs}ZDvB11g{TEZ@NpZr?UppD+l}aF`A`HO`~W{n
zoUICdQo)4G?wrgyb9U$L{pA%v1#4+cU@nCu=1o|zv1DVJVLFO+Ki0J%mbVNWUMRHN
zlcDexZ|PQ~+QMy_e*<?^vd3U|;)YOX#|*5_Fu5;7sSg;oO22aJ+t&=qYIG|YG9EQK
zk9$p_u6Q#bB=1E&53aeACjSDHx+4b+#Z$rc$%EhFVOum*)E7!WGC1`x6sj8V!9Y;e
zkth9%%lpz*!k2yF);)Pg-p9%6jEB4})aE$&tw^U!Uq-R=MNJw@>puwWcKJPbkj9FG
zN!Sjikg~DLaQIIX3|S-X26R^UqS+O`W=NFG-If0?jSZUe1dZN8&iJEU&RC?C21mB1
zDLRzhP(^~)O!*nCyfcJVUL7LwM399Uig^+OvJ`Vf&tnz^`hfLM8Zv~LCo^ipMmy8U
TqPIYqg(5LQEot~zB&E~`24tjX

literal 0
HcmV?d00001

diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.class b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.class
new file mode 100644
index 0000000000000000000000000000000000000000..0d6ca4e65268e29eed9cbb4aa7d6bd6368e95df1
GIT binary patch
literal 696
zcmbtS!Ab)$5PfNDx2;uMt%x^44_glgdaWoT77JSx3f^OOc1>B+HO-3tng>6?j}p_W
zSnN^+55t6clX>%A^7j7n3ZR2+4^0o79=1HR7+RMk?8TG36FR1AGfv6aXNG!TYcl7F
zm`rHGP!VC+OEMKQ_<k@FkAf%e0v}qVblhF6^xHQKJ2Bb(@u44Rvix3Yl14-}8k?AS
zG-a6Z8Bw<#DB0m6RoswNDe-=w9vnVD&<unYF`0w;;<tz{!*2cpYAUJew?Eg;tV;Mm
zq^`d@RIwH|GsF=6#*Y_O{(Hp}M_L<>Gb5>|634o?MCH-ccZS2i`@+!pd8@125lPFi
zpMU>MN=ogQp$w<_UGqjSb-&EOP;gOnzphwf@K6C<uA(-}tEfA4&7lRXyV#hW8YsJ5
Kb4ba>3aTGjg4b98

literal 0
HcmV?d00001

diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
new file mode 100644
index 0000000..504a003
--- /dev/null
+++ b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
@@ -0,0 +1,25 @@
+package ic2.api.recipe;
+
+import java.util.Map;
+
+import net.minecraftforge.fluids.Fluid;
+
+public interface ILiquidHeatExchangerManager extends ILiquidAcceptManager {
+
+	void addFluid(String fluidName, String fluidOutput, int huPerMB);
+
+	HeatExchangeProperty getHeatExchangeProperty(Fluid fluid);
+
+	Map<String, HeatExchangeProperty> getHeatExchangeProperties();
+
+	public static class HeatExchangeProperty {
+		public HeatExchangeProperty(Fluid outputFluid, int huPerMB) {
+			this.outputFluid = outputFluid;
+			this.huPerMB = huPerMB;
+		}
+
+		public final Fluid outputFluid;
+		public final int huPerMB;
+	}
+
+}
diff --git a/src/main/java/ic2/api/recipe/IListRecipeManager.class b/src/api/java/ic2/api/recipe/IListRecipeManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IListRecipeManager.class
rename to src/api/java/ic2/api/recipe/IListRecipeManager.class
diff --git a/src/main/java/ic2/api/recipe/IListRecipeManager.java b/src/api/java/ic2/api/recipe/IListRecipeManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/IListRecipeManager.java
rename to src/api/java/ic2/api/recipe/IListRecipeManager.java
diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManager.class b/src/api/java/ic2/api/recipe/IMachineRecipeManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IMachineRecipeManager.class
rename to src/api/java/ic2/api/recipe/IMachineRecipeManager.class
diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManager.java b/src/api/java/ic2/api/recipe/IMachineRecipeManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/IMachineRecipeManager.java
rename to src/api/java/ic2/api/recipe/IMachineRecipeManager.java
diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.class b/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.class
rename to src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.class
diff --git a/src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.java b/src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.java
rename to src/api/java/ic2/api/recipe/IMachineRecipeManagerExt.java
diff --git a/src/main/java/ic2/api/recipe/IPatternStorage.class b/src/api/java/ic2/api/recipe/IPatternStorage.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IPatternStorage.class
rename to src/api/java/ic2/api/recipe/IPatternStorage.class
diff --git a/src/main/java/ic2/api/recipe/IPatternStorage.java b/src/api/java/ic2/api/recipe/IPatternStorage.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/IPatternStorage.java
rename to src/api/java/ic2/api/recipe/IPatternStorage.java
diff --git a/src/main/java/ic2/api/recipe/IRecipeInput.class b/src/api/java/ic2/api/recipe/IRecipeInput.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IRecipeInput.class
rename to src/api/java/ic2/api/recipe/IRecipeInput.class
diff --git a/src/main/java/ic2/api/recipe/IRecipeInput.java b/src/api/java/ic2/api/recipe/IRecipeInput.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/IRecipeInput.java
rename to src/api/java/ic2/api/recipe/IRecipeInput.java
diff --git a/src/main/java/ic2/api/recipe/IScrapboxManager.class b/src/api/java/ic2/api/recipe/IScrapboxManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/IScrapboxManager.class
rename to src/api/java/ic2/api/recipe/IScrapboxManager.class
diff --git a/src/main/java/ic2/api/recipe/IScrapboxManager.java b/src/api/java/ic2/api/recipe/IScrapboxManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/IScrapboxManager.java
rename to src/api/java/ic2/api/recipe/IScrapboxManager.java
diff --git a/src/main/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class
rename to src/api/java/ic2/api/recipe/ISemiFluidFuelManager$BurnProperty.class
diff --git a/src/main/java/ic2/api/recipe/ISemiFluidFuelManager.class b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/ISemiFluidFuelManager.class
rename to src/api/java/ic2/api/recipe/ISemiFluidFuelManager.class
diff --git a/src/main/java/ic2/api/recipe/ISemiFluidFuelManager.java b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/ISemiFluidFuelManager.java
rename to src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java
diff --git a/src/main/java/ic2/api/recipe/RecipeInputFluidContainer.class b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/RecipeInputFluidContainer.class
rename to src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class
diff --git a/src/main/java/ic2/api/recipe/RecipeInputFluidContainer.java b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/RecipeInputFluidContainer.java
rename to src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java
diff --git a/src/main/java/ic2/api/recipe/RecipeInputItemStack.class b/src/api/java/ic2/api/recipe/RecipeInputItemStack.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/RecipeInputItemStack.class
rename to src/api/java/ic2/api/recipe/RecipeInputItemStack.class
diff --git a/src/main/java/ic2/api/recipe/RecipeInputItemStack.java b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/RecipeInputItemStack.java
rename to src/api/java/ic2/api/recipe/RecipeInputItemStack.java
diff --git a/src/main/java/ic2/api/recipe/RecipeInputOreDict.class b/src/api/java/ic2/api/recipe/RecipeInputOreDict.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/RecipeInputOreDict.class
rename to src/api/java/ic2/api/recipe/RecipeInputOreDict.class
diff --git a/src/main/java/ic2/api/recipe/RecipeInputOreDict.java b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/RecipeInputOreDict.java
rename to src/api/java/ic2/api/recipe/RecipeInputOreDict.java
diff --git a/src/main/java/ic2/api/recipe/RecipeOutput.class b/src/api/java/ic2/api/recipe/RecipeOutput.class
similarity index 90%
rename from src/main/java/ic2/api/recipe/RecipeOutput.class
rename to src/api/java/ic2/api/recipe/RecipeOutput.class
index 0dad69cfc545470a67433fd9edb423d9d9ddcc4e..a7d6b3fe88c91d0554cb8c3a15fb1bc46618a70a 100644
GIT binary patch
delta 66
zcmZ1?vP5KqD+i<eWH*jZMOlVW204ZV1_g#<21SNC1|^0r1{H>B45|z>8PpkOGiXo#
Wz)`^>{g**xat>z%qrv2(obdqfbq~-0

delta 66
zcmZ1?vP5KqD+i<CWH*jZMLC9026=`A21SNq1|^0%24#jW233Y>3~CHB88jGXGw4kI
Wz)``%`<Fp!at>z%qv7PEobdqdXb;Q)

diff --git a/src/main/java/ic2/api/recipe/RecipeOutput.java b/src/api/java/ic2/api/recipe/RecipeOutput.java
similarity index 94%
rename from src/main/java/ic2/api/recipe/RecipeOutput.java
rename to src/api/java/ic2/api/recipe/RecipeOutput.java
index 34c7fe9..80ad5fb 100644
--- a/src/main/java/ic2/api/recipe/RecipeOutput.java
+++ b/src/api/java/ic2/api/recipe/RecipeOutput.java
@@ -25,8 +25,7 @@ public final class RecipeOutput {
 			RecipeOutput ro = (RecipeOutput) obj;
 
 			if (items.size() == ro.items.size() &&
-					(metadata == null && ro.metadata == null || metadata != null && ro.metadata != null) &&
-					metadata.equals(ro.metadata)) {
+					(metadata == null && ro.metadata == null || metadata != null && ro.metadata != null && metadata.equals(ro.metadata))) {
 				Iterator<ItemStack> itA = items.iterator();
 				Iterator<ItemStack> itB = ro.items.iterator();
 
diff --git a/src/main/java/ic2/api/recipe/Recipes.class b/src/api/java/ic2/api/recipe/Recipes.class
similarity index 51%
rename from src/main/java/ic2/api/recipe/Recipes.class
rename to src/api/java/ic2/api/recipe/Recipes.class
index 559ffe86538a8a6271ee6f9efd10918472acd264..11854efefeda5ea5d7ecf2a9fe2ce92725f22ea1 100644
GIT binary patch
delta 229
zcmX@av7S@()W2Q(7#J9g81%Uqm>G1~8Fbkh^fro4V2T#a$t*0*OmWW7&q>KI&+|>p
zOH5BKVr0<q$xJrVPb|pPFG@|$EJ)S&^Z_gMNKGtptw_#D%mXTes<vii5QZ27k}WNO
z3Qu0lRLiW)pfXvR*_2UiawPM@2u=nC21TGlI2n|{G$R8e15gE!R0WFa18GJe&8oGX
kfpH^{!Ni~jB-y}%oDAwfHV;Grg9d{pkjKcN1y-dE0Fk&cF#rGn

delta 121
zcmZ3_d5A;w)W2Q(7#J9g7<9N8m>D$L8MN3Lv^R=QV4BRtT+OV&pg6gK*_2Ua@;2s$
z9*hi(3_uYesRY!b52P7^G^^Hj2F8s*1`~rakYoc3ax$m@**p*h45|!jKprE5I#`tk
E03^u|N&o-=

diff --git a/src/main/java/ic2/api/recipe/Recipes.java b/src/api/java/ic2/api/recipe/Recipes.java
similarity index 84%
rename from src/main/java/ic2/api/recipe/Recipes.java
rename to src/api/java/ic2/api/recipe/Recipes.java
index 4c12597..0aa0b75 100644
--- a/src/main/java/ic2/api/recipe/Recipes.java
+++ b/src/api/java/ic2/api/recipe/Recipes.java
@@ -3,7 +3,7 @@ package ic2.api.recipe;
 
 /**
  * General recipe registry.
- * 
+ *
  * @author Richard
  */
 public class Recipes {
@@ -23,12 +23,12 @@ public class Recipes {
 
 	/**
 	 * Reference amplifier values:
-	 * 
+	 *
 	 *  5000: Scrap
 	 * 45000: Scrapbox
-	 * 
+	 *
 	 * As Parameter for the Amplification Value you have to use the NBTTagCompound
-	 * 
+	 *
 	 * NBTTagCompound nbt = new NBTTagCompound();
 	 * nbt.setInteger("amplification", aValue);
 	 * matterAmplifier.addRecipe(yourStack, nbt);
@@ -57,4 +57,12 @@ public class Recipes {
 
 	public static ISemiFluidFuelManager semiFluidGenerator;
 	public static IFluidHeatManager FluidHeatGenerator;
+	/**
+	 * Used by the Liquid Heat Exchanger to cool down liquids and determine the amount of hu generated for every mb.
+	 */
+	public static ILiquidHeatExchangerManager liquidCooldownManager;
+	/**
+	 * Opposite of {@link #liquidCooldownManager}. This is for Liquids that can be heated up again.
+	 */
+	public static ILiquidHeatExchangerManager liquidHeatupManager;
 }
diff --git a/src/main/java/ic2/api/recipe/package-info.class b/src/api/java/ic2/api/recipe/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/recipe/package-info.class
rename to src/api/java/ic2/api/recipe/package-info.class
diff --git a/src/main/java/ic2/api/recipe/package-info.java b/src/api/java/ic2/api/recipe/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/recipe/package-info.java
rename to src/api/java/ic2/api/recipe/package-info.java
diff --git a/src/main/java/ic2/api/tile/ExplosionWhitelist.class b/src/api/java/ic2/api/tile/ExplosionWhitelist.class
similarity index 100%
rename from src/main/java/ic2/api/tile/ExplosionWhitelist.class
rename to src/api/java/ic2/api/tile/ExplosionWhitelist.class
diff --git a/src/main/java/ic2/api/tile/ExplosionWhitelist.java b/src/api/java/ic2/api/tile/ExplosionWhitelist.java
similarity index 100%
rename from src/main/java/ic2/api/tile/ExplosionWhitelist.java
rename to src/api/java/ic2/api/tile/ExplosionWhitelist.java
diff --git a/src/main/java/ic2/api/tile/IEnergyStorage.class b/src/api/java/ic2/api/tile/IEnergyStorage.class
similarity index 100%
rename from src/main/java/ic2/api/tile/IEnergyStorage.class
rename to src/api/java/ic2/api/tile/IEnergyStorage.class
diff --git a/src/main/java/ic2/api/tile/IEnergyStorage.java b/src/api/java/ic2/api/tile/IEnergyStorage.java
similarity index 100%
rename from src/main/java/ic2/api/tile/IEnergyStorage.java
rename to src/api/java/ic2/api/tile/IEnergyStorage.java
diff --git a/src/main/java/ic2/api/tile/IWrenchable.class b/src/api/java/ic2/api/tile/IWrenchable.class
similarity index 100%
rename from src/main/java/ic2/api/tile/IWrenchable.class
rename to src/api/java/ic2/api/tile/IWrenchable.class
diff --git a/src/main/java/ic2/api/tile/IWrenchable.java b/src/api/java/ic2/api/tile/IWrenchable.java
similarity index 100%
rename from src/main/java/ic2/api/tile/IWrenchable.java
rename to src/api/java/ic2/api/tile/IWrenchable.java
diff --git a/src/main/java/ic2/api/tile/package-info.class b/src/api/java/ic2/api/tile/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/tile/package-info.class
rename to src/api/java/ic2/api/tile/package-info.class
diff --git a/src/main/java/ic2/api/tile/package-info.java b/src/api/java/ic2/api/tile/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/tile/package-info.java
rename to src/api/java/ic2/api/tile/package-info.java
diff --git a/src/main/java/ic2/api/util/IKeyboard.class b/src/api/java/ic2/api/util/IKeyboard.class
similarity index 100%
rename from src/main/java/ic2/api/util/IKeyboard.class
rename to src/api/java/ic2/api/util/IKeyboard.class
diff --git a/src/main/java/ic2/api/util/IKeyboard.java b/src/api/java/ic2/api/util/IKeyboard.java
similarity index 100%
rename from src/main/java/ic2/api/util/IKeyboard.java
rename to src/api/java/ic2/api/util/IKeyboard.java
diff --git a/src/main/java/ic2/api/util/Keys.class b/src/api/java/ic2/api/util/Keys.class
similarity index 100%
rename from src/main/java/ic2/api/util/Keys.class
rename to src/api/java/ic2/api/util/Keys.class
diff --git a/src/main/java/ic2/api/util/Keys.java b/src/api/java/ic2/api/util/Keys.java
similarity index 100%
rename from src/main/java/ic2/api/util/Keys.java
rename to src/api/java/ic2/api/util/Keys.java
diff --git a/src/main/java/ic2/api/util/package-info.class b/src/api/java/ic2/api/util/package-info.class
similarity index 100%
rename from src/main/java/ic2/api/util/package-info.class
rename to src/api/java/ic2/api/util/package-info.class
diff --git a/src/main/java/ic2/api/util/package-info.java b/src/api/java/ic2/api/util/package-info.java
similarity index 100%
rename from src/main/java/ic2/api/util/package-info.java
rename to src/api/java/ic2/api/util/package-info.java
diff --git a/src/main/java/thaumcraft/api/BlockCoordinates.java b/src/api/java/thaumcraft/api/BlockCoordinates.java
similarity index 100%
rename from src/main/java/thaumcraft/api/BlockCoordinates.java
rename to src/api/java/thaumcraft/api/BlockCoordinates.java
diff --git a/src/main/java/thaumcraft/api/IArchitect.java b/src/api/java/thaumcraft/api/IArchitect.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IArchitect.java
rename to src/api/java/thaumcraft/api/IArchitect.java
diff --git a/src/main/java/thaumcraft/api/IGoggles.java b/src/api/java/thaumcraft/api/IGoggles.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IGoggles.java
rename to src/api/java/thaumcraft/api/IGoggles.java
diff --git a/src/main/java/thaumcraft/api/IRepairable.java b/src/api/java/thaumcraft/api/IRepairable.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IRepairable.java
rename to src/api/java/thaumcraft/api/IRepairable.java
diff --git a/src/main/java/thaumcraft/api/IRepairableExtended.java b/src/api/java/thaumcraft/api/IRepairableExtended.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IRepairableExtended.java
rename to src/api/java/thaumcraft/api/IRepairableExtended.java
diff --git a/src/main/java/thaumcraft/api/IRunicArmor.java b/src/api/java/thaumcraft/api/IRunicArmor.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IRunicArmor.java
rename to src/api/java/thaumcraft/api/IRunicArmor.java
diff --git a/src/main/java/thaumcraft/api/IScribeTools.java b/src/api/java/thaumcraft/api/IScribeTools.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IScribeTools.java
rename to src/api/java/thaumcraft/api/IScribeTools.java
diff --git a/src/main/java/thaumcraft/api/IVisDiscountGear.java b/src/api/java/thaumcraft/api/IVisDiscountGear.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IVisDiscountGear.java
rename to src/api/java/thaumcraft/api/IVisDiscountGear.java
diff --git a/src/main/java/thaumcraft/api/IWarpingGear.java b/src/api/java/thaumcraft/api/IWarpingGear.java
similarity index 100%
rename from src/main/java/thaumcraft/api/IWarpingGear.java
rename to src/api/java/thaumcraft/api/IWarpingGear.java
diff --git a/src/main/java/thaumcraft/api/ItemApi.java b/src/api/java/thaumcraft/api/ItemApi.java
similarity index 100%
rename from src/main/java/thaumcraft/api/ItemApi.java
rename to src/api/java/thaumcraft/api/ItemApi.java
diff --git a/src/main/java/thaumcraft/api/ItemRunic.java b/src/api/java/thaumcraft/api/ItemRunic.java
similarity index 100%
rename from src/main/java/thaumcraft/api/ItemRunic.java
rename to src/api/java/thaumcraft/api/ItemRunic.java
diff --git a/src/main/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java
similarity index 100%
rename from src/main/java/thaumcraft/api/ThaumcraftApi.java
rename to src/api/java/thaumcraft/api/ThaumcraftApi.java
diff --git a/src/main/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java
similarity index 100%
rename from src/main/java/thaumcraft/api/ThaumcraftApiHelper.java
rename to src/api/java/thaumcraft/api/ThaumcraftApiHelper.java
diff --git a/src/main/java/thaumcraft/api/TileThaumcraft.java b/src/api/java/thaumcraft/api/TileThaumcraft.java
similarity index 100%
rename from src/main/java/thaumcraft/api/TileThaumcraft.java
rename to src/api/java/thaumcraft/api/TileThaumcraft.java
diff --git a/src/main/java/thaumcraft/api/WorldCoordinates.java b/src/api/java/thaumcraft/api/WorldCoordinates.java
similarity index 100%
rename from src/main/java/thaumcraft/api/WorldCoordinates.java
rename to src/api/java/thaumcraft/api/WorldCoordinates.java
diff --git a/src/main/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java
similarity index 100%
rename from src/main/java/thaumcraft/api/aspects/Aspect.java
rename to src/api/java/thaumcraft/api/aspects/Aspect.java
diff --git a/src/main/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java
similarity index 100%
rename from src/main/java/thaumcraft/api/aspects/AspectList.java
rename to src/api/java/thaumcraft/api/aspects/AspectList.java
diff --git a/src/main/java/thaumcraft/api/aspects/AspectSourceHelper.java b/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java
similarity index 100%
rename from src/main/java/thaumcraft/api/aspects/AspectSourceHelper.java
rename to src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java
diff --git a/src/main/java/thaumcraft/api/aspects/IAspectContainer.java b/src/api/java/thaumcraft/api/aspects/IAspectContainer.java
similarity index 100%
rename from src/main/java/thaumcraft/api/aspects/IAspectContainer.java
rename to src/api/java/thaumcraft/api/aspects/IAspectContainer.java
diff --git a/src/main/java/thaumcraft/api/aspects/IAspectSource.java b/src/api/java/thaumcraft/api/aspects/IAspectSource.java
similarity index 100%
rename from src/main/java/thaumcraft/api/aspects/IAspectSource.java
rename to src/api/java/thaumcraft/api/aspects/IAspectSource.java
diff --git a/src/main/java/thaumcraft/api/aspects/IEssentiaContainerItem.java b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java
similarity index 100%
rename from src/main/java/thaumcraft/api/aspects/IEssentiaContainerItem.java
rename to src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java
diff --git a/src/main/java/thaumcraft/api/aspects/IEssentiaTransport.java b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java
similarity index 100%
rename from src/main/java/thaumcraft/api/aspects/IEssentiaTransport.java
rename to src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java
diff --git a/src/main/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java
similarity index 100%
rename from src/main/java/thaumcraft/api/crafting/CrucibleRecipe.java
rename to src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java
diff --git a/src/main/java/thaumcraft/api/crafting/IArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java
similarity index 100%
rename from src/main/java/thaumcraft/api/crafting/IArcaneRecipe.java
rename to src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java
diff --git a/src/main/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java
similarity index 100%
rename from src/main/java/thaumcraft/api/crafting/IInfusionStabiliser.java
rename to src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java
diff --git a/src/main/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java
similarity index 100%
rename from src/main/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java
rename to src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java
diff --git a/src/main/java/thaumcraft/api/crafting/InfusionRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java
similarity index 100%
rename from src/main/java/thaumcraft/api/crafting/InfusionRecipe.java
rename to src/api/java/thaumcraft/api/crafting/InfusionRecipe.java
diff --git a/src/main/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java
similarity index 100%
rename from src/main/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java
rename to src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java
diff --git a/src/main/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java
similarity index 100%
rename from src/main/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java
rename to src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java
diff --git a/src/main/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java
similarity index 100%
rename from src/main/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java
rename to src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java
diff --git a/src/main/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java
similarity index 100%
rename from src/main/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java
rename to src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java
diff --git a/src/main/java/thaumcraft/api/entities/IEldritchMob.java b/src/api/java/thaumcraft/api/entities/IEldritchMob.java
similarity index 100%
rename from src/main/java/thaumcraft/api/entities/IEldritchMob.java
rename to src/api/java/thaumcraft/api/entities/IEldritchMob.java
diff --git a/src/main/java/thaumcraft/api/entities/ITaintedMob.java b/src/api/java/thaumcraft/api/entities/ITaintedMob.java
similarity index 100%
rename from src/main/java/thaumcraft/api/entities/ITaintedMob.java
rename to src/api/java/thaumcraft/api/entities/ITaintedMob.java
diff --git a/src/main/java/thaumcraft/api/internal/DummyInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java
similarity index 100%
rename from src/main/java/thaumcraft/api/internal/DummyInternalMethodHandler.java
rename to src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java
diff --git a/src/main/java/thaumcraft/api/internal/IInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java
similarity index 100%
rename from src/main/java/thaumcraft/api/internal/IInternalMethodHandler.java
rename to src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java
diff --git a/src/main/java/thaumcraft/api/internal/WeightedRandomLoot.java b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java
similarity index 100%
rename from src/main/java/thaumcraft/api/internal/WeightedRandomLoot.java
rename to src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java
diff --git a/src/main/java/thaumcraft/api/nodes/INode.java b/src/api/java/thaumcraft/api/nodes/INode.java
similarity index 100%
rename from src/main/java/thaumcraft/api/nodes/INode.java
rename to src/api/java/thaumcraft/api/nodes/INode.java
diff --git a/src/main/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/nodes/IRevealer.java
similarity index 100%
rename from src/main/java/thaumcraft/api/nodes/IRevealer.java
rename to src/api/java/thaumcraft/api/nodes/IRevealer.java
diff --git a/src/main/java/thaumcraft/api/nodes/NodeModifier.java b/src/api/java/thaumcraft/api/nodes/NodeModifier.java
similarity index 100%
rename from src/main/java/thaumcraft/api/nodes/NodeModifier.java
rename to src/api/java/thaumcraft/api/nodes/NodeModifier.java
diff --git a/src/main/java/thaumcraft/api/nodes/NodeType.java b/src/api/java/thaumcraft/api/nodes/NodeType.java
similarity index 100%
rename from src/main/java/thaumcraft/api/nodes/NodeType.java
rename to src/api/java/thaumcraft/api/nodes/NodeType.java
diff --git a/src/main/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java
similarity index 100%
rename from src/main/java/thaumcraft/api/package-info.java
rename to src/api/java/thaumcraft/api/package-info.java
diff --git a/src/main/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java
similarity index 100%
rename from src/main/java/thaumcraft/api/potions/PotionFluxTaint.java
rename to src/api/java/thaumcraft/api/potions/PotionFluxTaint.java
diff --git a/src/main/java/thaumcraft/api/potions/PotionVisExhaust.java b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java
similarity index 100%
rename from src/main/java/thaumcraft/api/potions/PotionVisExhaust.java
rename to src/api/java/thaumcraft/api/potions/PotionVisExhaust.java
diff --git a/src/main/java/thaumcraft/api/research/IScanEventHandler.java b/src/api/java/thaumcraft/api/research/IScanEventHandler.java
similarity index 100%
rename from src/main/java/thaumcraft/api/research/IScanEventHandler.java
rename to src/api/java/thaumcraft/api/research/IScanEventHandler.java
diff --git a/src/main/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java
similarity index 100%
rename from src/main/java/thaumcraft/api/research/ResearchCategories.java
rename to src/api/java/thaumcraft/api/research/ResearchCategories.java
diff --git a/src/main/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java
similarity index 100%
rename from src/main/java/thaumcraft/api/research/ResearchCategoryList.java
rename to src/api/java/thaumcraft/api/research/ResearchCategoryList.java
diff --git a/src/main/java/thaumcraft/api/research/ResearchItem.java b/src/api/java/thaumcraft/api/research/ResearchItem.java
similarity index 100%
rename from src/main/java/thaumcraft/api/research/ResearchItem.java
rename to src/api/java/thaumcraft/api/research/ResearchItem.java
diff --git a/src/main/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java
similarity index 100%
rename from src/main/java/thaumcraft/api/research/ResearchPage.java
rename to src/api/java/thaumcraft/api/research/ResearchPage.java
diff --git a/src/main/java/thaumcraft/api/research/ScanResult.java b/src/api/java/thaumcraft/api/research/ScanResult.java
similarity index 100%
rename from src/main/java/thaumcraft/api/research/ScanResult.java
rename to src/api/java/thaumcraft/api/research/ScanResult.java
diff --git a/src/main/java/thaumcraft/api/visnet/TileVisNode.java b/src/api/java/thaumcraft/api/visnet/TileVisNode.java
similarity index 100%
rename from src/main/java/thaumcraft/api/visnet/TileVisNode.java
rename to src/api/java/thaumcraft/api/visnet/TileVisNode.java
diff --git a/src/main/java/thaumcraft/api/visnet/VisNetHandler.java b/src/api/java/thaumcraft/api/visnet/VisNetHandler.java
similarity index 100%
rename from src/main/java/thaumcraft/api/visnet/VisNetHandler.java
rename to src/api/java/thaumcraft/api/visnet/VisNetHandler.java
diff --git a/src/main/java/thaumcraft/api/wands/FocusUpgradeType.java b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/FocusUpgradeType.java
rename to src/api/java/thaumcraft/api/wands/FocusUpgradeType.java
diff --git a/src/main/java/thaumcraft/api/wands/IWandRodOnUpdate.java b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/IWandRodOnUpdate.java
rename to src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java
diff --git a/src/main/java/thaumcraft/api/wands/IWandTriggerManager.java b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/IWandTriggerManager.java
rename to src/api/java/thaumcraft/api/wands/IWandTriggerManager.java
diff --git a/src/main/java/thaumcraft/api/wands/IWandable.java b/src/api/java/thaumcraft/api/wands/IWandable.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/IWandable.java
rename to src/api/java/thaumcraft/api/wands/IWandable.java
diff --git a/src/main/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/ItemFocusBasic.java
rename to src/api/java/thaumcraft/api/wands/ItemFocusBasic.java
diff --git a/src/main/java/thaumcraft/api/wands/StaffRod.java b/src/api/java/thaumcraft/api/wands/StaffRod.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/StaffRod.java
rename to src/api/java/thaumcraft/api/wands/StaffRod.java
diff --git a/src/main/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/WandCap.java
rename to src/api/java/thaumcraft/api/wands/WandCap.java
diff --git a/src/main/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/WandRod.java
rename to src/api/java/thaumcraft/api/wands/WandRod.java
diff --git a/src/main/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java
similarity index 100%
rename from src/main/java/thaumcraft/api/wands/WandTriggerRegistry.java
rename to src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java
diff --git a/src/main/java/ic2/api/Direction.class b/src/main/java/ic2/api/Direction.class
deleted file mode 100644
index 9377993096c313361c53c27b9bc69fea24947f82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3644
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
W>EW$y#!W0R${Wp~2#2;!DE$xjbxpbe

diff --git a/src/main/java/ic2/api/crops/CropCard.class b/src/main/java/ic2/api/crops/CropCard.class
deleted file mode 100644
index e117b0c958114f63ac80433c027c5433c3a6b8d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6036
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

diff --git a/src/main/java/ic2/api/item/IKineticWindRotor.class b/src/main/java/ic2/api/item/IKineticWindRotor.class
deleted file mode 100644
index 00f10fc86f1111a2bc90c6e9c78dcbe8f9547b80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 408
zcma)2!AiqG6r8PXqpejD^eA}KiwnK>Y74=NkO-dF?Mr+$*~t1L_18T30e+OY3Axyd
zUf#ek^WMz+`u_L?FvVenNrVH1aZYm0rX(S+aDK6LB)Vir)|*T;3za$!BNbzxXP2?U
zNpK{UR6ZfMB7aXCsXZyo|MG6Fu7wMo&}&tDOUud{;mXYvCSm_P%h)nG`~Hti3x(t0
zxn=jjZk38Bm&;Q}n$2%=l(zR4T!hG{@l9wdY#UA6>1u7>jKUe)sWva%_1{)095p&!
q7?<n2$2D0QDk${AZ-GHyVF!I6-~huGBkZ=g*YTqUgJT?K5BooIHFbFa

diff --git a/src/main/java/ic2/api/item/ILatheItem.class b/src/main/java/ic2/api/item/ILatheItem.class
deleted file mode 100644
index 7bbb877def79a570416ee644ff9dd5fa045d4651..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcma)4O-}+b5S=1lq6mJX7Zdg3UTngZgE0h>O*WDM!Got#2DZ4{CA%%^U-RG(@JAVk
zMLl?6J+!Zxd2i-*+K<n-cK~R@X$ekB&|pxWp?Odf<1@Ip_B0wEDvdH0Q^S?Pkh`=E
zjF3+)$7N6>dfUb^YC}PT3@)=&k0dK6_`|=-;JdCfVo;?%J!=-$tok#!%~Cm=y|10G
zE4F>1<v*OePM1N2j12L`*q9WZ3>SY*Sfc{o$0V|`L@$!Us7SXMob|0XD#VdW)HuL9
zts@#H<r12wCl}8=j3x=6h5?T;5LQbcV?Iz5?CIc@3KW(iuw>|bBbkWBw&!;4hjfoY
zYND$GlGR*K7#~-oy_t)pV9-#q$;Co_zxi*PL48HwfzUJF8_!XiA_E3F`b7Z6JcBLB
q0}vLVm|_XaDQ-h0#U0p9u?l;ntC6ZoSf{m*Z~%vNIHF(<j=umFn8RNH

diff --git a/src/main/java/ic2/api/network/NetworkHelper.class b/src/main/java/ic2/api/network/NetworkHelper.class
deleted file mode 100644
index 85ff02b4763faf73c6cd1f066bc3b24425e9d4ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4190
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
R0c$zadz$YHeA9xN{{bnMBI^JE

diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java
index 6155a39..03ccfd3 100644
--- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java
+++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt;
 
 import cpw.mods.fml.common.FMLCommonHandler;
diff --git a/src/main/java/tombenpotter/emt/client/EMTKeys.java b/src/main/java/tombenpotter/emt/client/EMTKeys.java
index 8fa688e..5064ff3 100644
--- a/src/main/java/tombenpotter/emt/client/EMTKeys.java
+++ b/src/main/java/tombenpotter/emt/client/EMTKeys.java
@@ -8,32 +8,20 @@ import java.util.Set;
 
 import org.lwjgl.input.Keyboard;
 
+import tombenpotter.emt.common.util.TextHelper;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import net.minecraft.client.settings.KeyBinding;
 
 public class EMTKeys{
-	private static Map<String, KeyBinding> keys = new HashMap<String, KeyBinding>();
-	
-	public static void addKey(KeyBinding kb, String name){
-		keys.put(name, kb);
-	}
+	public static KeyBinding keyUnequip;
 	
 	public static void registerKeys(){
-		addKey(new KeyBinding("UnEquip", Keyboard.KEY_Z, "EMT"), "UnEquip");
-		
-		for(Entry<String, KeyBinding> entry : keys.entrySet()){
-			ClientRegistry.registerKeyBinding(entry.getValue());
-		}
+		keyUnequip = new KeyBinding(TextHelper.localize("gui.EMT.key.unequip"), Keyboard.KEY_Z, "EMT");
+		ClientRegistry.registerKeyBinding(keyUnequip);
+
 	}
 	
-	public static KeyBinding getKey(String name){
-
-		for(Entry<String, KeyBinding> entry : keys.entrySet()){
-			if(name.equals(entry.getKey())){
-				return entry.getValue();
-			}
-		}
-		
-		return null;
+	public static boolean keyUnequipPressed(){
+		return keyUnequip.getIsKeyPressed();
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java
index c99ec5d..13eca43 100644
--- a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java
+++ b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.client.gui;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java
index 24da41a..490a41d 100644
--- a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java
+++ b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.client.gui;
 
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java
index 3118bc5..cc0344f 100644
--- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java
+++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.client.gui.container;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java
index 3f8cd7a..cb23171 100644
--- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java
+++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.client.gui.container;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java
index 33baace..9fca981 100644
--- a/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java
+++ b/src/main/java/tombenpotter/emt/client/model/ModelCpecialArmor.java
@@ -34,7 +34,6 @@ public class ModelCpecialArmor extends ModelBiped
     public int heldItemRight;
     public boolean isSneak;
     public boolean aimedBow;
-    private static final String __OBFID = "CL_00000840";
 
     public ModelCpecialArmor()
     {
diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderArcher.java b/src/main/java/tombenpotter/emt/client/renderer/RenderArcher.java
deleted file mode 100644
index 96a1d6c..0000000
--- a/src/main/java/tombenpotter/emt/client/renderer/RenderArcher.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
-package tombenpotter.emt.client.renderer;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.entity.RenderSnowMan;
-
-@SideOnly(Side.CLIENT)
-public class RenderArcher extends RenderSnowMan {
-
-}
diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java
index 71549a9..c6e85e7 100644
--- a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java
+++ b/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.client.renderer;
 
 import net.minecraft.client.renderer.Tessellator;
diff --git a/src/main/java/tombenpotter/emt/common/EMTResearch.java b/src/main/java/tombenpotter/emt/common/EMTResearch.java
index 3b1e7b6..fe4d859 100644
--- a/src/main/java/tombenpotter/emt/common/EMTResearch.java
+++ b/src/main/java/tombenpotter/emt/common/EMTResearch.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common;
 
 import ic2.api.item.IC2Items;
diff --git a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java
index 04b1be8..b9b87ac 100644
--- a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java
+++ b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common;
 
 import cpw.mods.fml.common.Loader;
diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java
index 6265fbd..5252b1d 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java
index 79468cb..956d079 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java
index 60a43eb..4f3203b 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java
index 2853349..f4a3673 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEssentiaGenerators.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java
index ac50e02..0bfd7df 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockPortableNode.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java
index 541bcd5..d96f3fe 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockRegistry.java
@@ -22,7 +22,6 @@ public class BlockRegistry {
     public static Block emtSolars;
     public static Block emtMachines;
     public static Block emtSolars2;
-    //public static Block essentiaGenerator;
 
 
     public static void registerBlocks() {
@@ -43,8 +42,5 @@ public class BlockRegistry {
 
         essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens");
         GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators");
-
-        //essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator");
-        //GameRegistry.registerBlock(essentiaGenerator, ItemBlockEssentiaGenerator.class, "Essentia Generator");
     }
 }
diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java b/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java
index faad4c8..f1f3f5a 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockShield.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.blocks;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java b/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java
index 656ce0d..606ee15 100644
--- a/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java
+++ b/src/main/java/tombenpotter/emt/common/entities/BaseEntityRegistry.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.entities;
 
 import cpw.mods.fml.common.registry.EntityRegistry;
@@ -23,7 +11,6 @@ public class BaseEntityRegistry {
 
     private static int startEID = 300;
     private static int entityIDs = 0;
-    private static final Class<? extends EntityLiving> ARCHER_CLASS = EntityArcher.class;
 
     private static int getUniqueEntityID() {
 
@@ -45,6 +32,6 @@ public class BaseEntityRegistry {
 
         EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
         EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectroMagicTools.instance, 80, 3, true);
-        registerEntityEgg(ARCHER_CLASS, 0x99111F, 0xE5685);
+        registerEntityEgg(EntityArcher.class, 0x99111F, 0xE5685);
     }
 }
diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java
index 65bceb8..e3d5f90 100644
--- a/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java
+++ b/src/main/java/tombenpotter/emt/common/entities/EntityArcher.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.entities;
 
 import net.minecraft.enchantment.Enchantment;
diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java
index 669d4a1..62bd03b 100644
--- a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java
+++ b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java
@@ -187,7 +187,7 @@ public class EntityLaser extends Entity implements IProjectile {
 			Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
 			Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
 			MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false);
-			vec31 = Vec3.createVectorHelper(this.posX - 5, this.posY, this.posZ);
+			vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ);
 			vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
 
 			if (movingobjectposition != null) {
@@ -252,9 +252,9 @@ public class EntityLaser extends Entity implements IProjectile {
 					this.zTile = movingobjectposition.blockZ;
 					this.inTile = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile);
 					this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile);
-					this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX));
-					this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY));
-					this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ));
+					this.motionX = movingobjectposition.hitVec.xCoord - this.posX;
+					this.motionY = movingobjectposition.hitVec.yCoord - this.posY;
+					this.motionZ = movingobjectposition.hitVec.zCoord - this.posZ;
 					f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ);
 					this.posX -= this.motionX / (double) f2 * 0.05000000074505806D;
 					this.posY -= this.motionY / (double) f2 * 0.05000000074505806D;
diff --git a/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java
deleted file mode 100644
index e02a657..0000000
--- a/src/main/java/tombenpotter/emt/common/items/ItemBaseChainsaw.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package tombenpotter.emt.common.items;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemAxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.StatList;
-import net.minecraft.world.World;
-import net.minecraftforge.common.IShearable;
-import tombenpotter.emt.ElectroMagicTools;
-import tombenpotter.emt.ModInformation;
-import tombenpotter.emt.common.util.ConfigHandler;
-import tombenpotter.emt.common.util.RandomHelper;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-public class ItemBaseChainsaw extends ItemAxe {
-
-    public String textureName;
-
-    public ItemBaseChainsaw(ToolMaterial material, int maxDamage, String textureName) {
-        super(material);
-        this.setCreativeTab(ElectroMagicTools.tabEMT);
-        this.setMaxStackSize(1);
-        this.setMaxDamage(maxDamage);
-        this.textureName = textureName;
-        this.efficiencyOnProperMaterial = this.toolMaterial.getEfficiencyOnProperMaterial();
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public void registerIcons(IIconRegister iconRegister) {
-        this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/chainsaws" + textureName);
-    }
-
-    @Override
-    public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) {
-        if ((double) block.getBlockHardness(world, x, y, z) != 0.0D) stack.damageItem(1, entityLiving);
-        return true;
-    }
-
-    @Override
-    public boolean canHarvestBlock(Block block, ItemStack stack) {
-        return false;
-    }
-
-    @Override
-    public float getDigSpeed(ItemStack stack, Block block, int meta) {
-        if (block.getHarvestTool(meta) == null) {
-            return efficiencyOnProperMaterial;
-        } else {
-            if ((canHarvestBlock(block, stack) && (block.getHarvestTool(meta).equals("axe")) || Items.shears.canHarvestBlock(block, stack))) {
-                return efficiencyOnProperMaterial;
-            }
-        }
-        return super.getDigSpeed(stack, block, meta);
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
-        return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
-    }
-
-    @Override
-    public boolean isRepairable() {
-        return false;
-    }
-
-    @Override
-    public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) {
-        return false;
-    }
-
-    @Override
-    public int getItemEnchantability() {
-        if (ConfigHandler.enchanting == false) return 0;
-        else return toolMaterial.getEnchantability();
-    }
-
-    @Override
-    public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
-        return ConfigHandler.enchanting;
-    }
-
-    @Override
-    public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) {
-        stack.damageItem(1, attacker);
-        return true;
-    }
-
-    @Override
-    public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) {
-        if (player.worldObj.isRemote) {
-            return false;
-        }
-        Block block = player.worldObj.getBlock(x, y, z);
-        if (block instanceof IShearable) {
-            IShearable target = (IShearable) block;
-            if (target.isShearable(stack, player.worldObj, x, y, z)) {
-                ArrayList<ItemStack> drops = target.onSheared(stack, player.worldObj, x, y, z,
-                        EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack));
-                Random rand = new Random();
-                for (ItemStack drop : drops) {
-                    float f = 0.7F;
-                    double d = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-                    double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-                    double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-                    EntityItem entityitem = new EntityItem(player.worldObj, (double) x + d, (double) y + d1, (double) z + d2, drop);
-                    entityitem.delayBeforeCanPickup = 10;
-                    player.worldObj.spawnEntityInWorld(entityitem);
-                }
-                stack.damageItem(1, player);
-                player.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(block)], 1);
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java
deleted file mode 100644
index 5fa46b6..0000000
--- a/src/main/java/tombenpotter/emt/common/items/ItemBaseDrill.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package tombenpotter.emt.common.items;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemPickaxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import tombenpotter.emt.ElectroMagicTools;
-import tombenpotter.emt.ModInformation;
-import tombenpotter.emt.common.util.ConfigHandler;
-import tombenpotter.emt.common.util.RandomHelper;
-
-public class ItemBaseDrill extends ItemPickaxe {
-
-    public String textureName;
-
-    public ItemBaseDrill(ToolMaterial material, int maxDamage, String textureName) {
-        super(material);
-        this.setCreativeTab(ElectroMagicTools.tabEMT);
-        this.setMaxStackSize(1);
-        this.setMaxDamage(maxDamage);
-        this.textureName = textureName;
-        this.efficiencyOnProperMaterial = this.toolMaterial.getEfficiencyOnProperMaterial();
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public void registerIcons(IIconRegister iconRegister) {
-        this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/drills/" + textureName);
-    }
-
-    @Override
-    public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) {
-        if ((double) block.getBlockHardness(world, x, y, z) != 0.0D) stack.damageItem(1, entityLiving);
-        return true;
-    }
-
-    @Override
-    public boolean canHarvestBlock(Block block, ItemStack stack) {
-        return false;
-    }
-
-    @Override
-    public float getDigSpeed(ItemStack stack, Block block, int meta) {
-        if (block.getHarvestTool(meta) == null) {
-            return efficiencyOnProperMaterial;
-        } else {
-            if (canHarvestBlock(block, stack) && (block.getHarvestTool(meta).equals("pickaxe") || block.getHarvestTool(meta).equals("shovel"))) {
-                return efficiencyOnProperMaterial;
-            }
-        }
-        return super.getDigSpeed(stack, block, meta);
-    }
-
-    @Override
-    public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) {
-        return true;
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
-        return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
-    }
-
-    @Override
-    public boolean isRepairable() {
-        return false;
-    }
-
-    @Override
-    public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) {
-        return false;
-    }
-
-    @Override
-    public int getItemEnchantability() {
-        if (ConfigHandler.enchanting == false) return 0;
-        else return toolMaterial.getEnchantability();
-    }
-
-    @Override
-    public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
-        return ConfigHandler.enchanting;
-    }
-}
diff --git a/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java b/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java
deleted file mode 100644
index 44f28b2..0000000
--- a/src/main/java/tombenpotter/emt/common/items/ItemBaseOmnitool.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package tombenpotter.emt.common.items;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemPickaxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.StatList;
-import net.minecraft.world.World;
-import net.minecraftforge.common.IShearable;
-import tombenpotter.emt.ElectroMagicTools;
-import tombenpotter.emt.ModInformation;
-import tombenpotter.emt.common.util.ConfigHandler;
-import tombenpotter.emt.common.util.RandomHelper;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-public class ItemBaseOmnitool extends ItemPickaxe {
-
-    public String textureName;
-
-    public ItemBaseOmnitool(ToolMaterial material, int maxDamage, String textureName) {
-        super(material);
-        this.setCreativeTab(ElectroMagicTools.tabEMT);
-        this.setMaxStackSize(1);
-        this.setMaxDamage(maxDamage);
-        this.textureName = textureName;
-        this.efficiencyOnProperMaterial = this.toolMaterial.getEfficiencyOnProperMaterial();
-    }
-
-    @SideOnly(Side.CLIENT)
-    @Override
-    public void registerIcons(IIconRegister iconRegister) {
-        this.itemIcon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/omnitools" + textureName);
-    }
-
-    @Override
-    public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) {
-        if ((double) block.getBlockHardness(world, x, y, z) != 0.0D) stack.damageItem(1, entityLiving);
-        return true;
-    }
-
-    @Override
-    public boolean canHarvestBlock(Block block, ItemStack stack) {
-        return false;
-    }
-
-    @Override
-    public float getDigSpeed(ItemStack stack, Block block, int meta) {
-        if (block.getHarvestTool(meta) == null) {
-            return efficiencyOnProperMaterial;
-        } else {
-            if (canHarvestBlock(block, stack) && (block.getHarvestTool(meta).equals("pickaxe") || block.getHarvestTool(meta).equals("shovel")) || block.getHarvestTool(meta).equals("axe") || Items.shears.canHarvestBlock(block, stack)) {
-                return efficiencyOnProperMaterial;
-            }
-        }
-        return super.getDigSpeed(stack, block, meta);
-    }
-
-    @Override
-    public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) {
-        stack.damageItem(1, attacker);
-        return true;
-    }
-
-    @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
-        return RandomHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
-    }
-
-    @Override
-    public boolean isRepairable() {
-        return false;
-    }
-
-    @Override
-    public int getItemEnchantability() {
-        if (ConfigHandler.enchanting == false) return 0;
-        else return toolMaterial.getEnchantability();
-    }
-
-    @Override
-    public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) {
-        return ConfigHandler.enchanting;
-    }
-
-    @Override
-    public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) {
-        if (player.worldObj.isRemote) {
-            return false;
-        }
-        Block block = player.worldObj.getBlock(x, y, z);
-        if (block instanceof IShearable) {
-            IShearable target = (IShearable) block;
-            if (target.isShearable(stack, player.worldObj, x, y, z)) {
-                ArrayList<ItemStack> drops = target.onSheared(stack, player.worldObj, x, y, z,
-                        EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack));
-                Random rand = new Random();
-                for (ItemStack drop : drops) {
-                    float f = 0.7F;
-                    double d = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-                    double d1 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-                    double d2 = (double) (rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-                    EntityItem entityitem = new EntityItem(player.worldObj, (double) x + d, (double) y + d1, (double) z + d2, drop);
-                    entityitem.delayBeforeCanPickup = 10;
-                    player.worldObj.spawnEntityInWorld(entityitem);
-                }
-                stack.damageItem(1, player);
-                player.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(block)], 1);
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java b/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java
index da3676a..4fa53f1 100644
--- a/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java
+++ b/src/main/java/tombenpotter/emt/common/items/ItemElectricScribingTools.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java
index b8e9c79..c7995ef 100644
--- a/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java
+++ b/src/main/java/tombenpotter/emt/common/items/ItemMaterials.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java
index 590d42b..b37d4f0 100644
--- a/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java
+++ b/src/main/java/tombenpotter/emt/common/items/ItemRegistry.java
@@ -11,12 +11,12 @@ import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.oredict.OreDictionary;
 import thaumcraft.api.ThaumcraftApi;
 import tombenpotter.emt.ModInformation;
-import tombenpotter.emt.common.items.armor.ItemInfusedQuantum;
 import tombenpotter.emt.common.items.armor.wings.ItemFeatherWing;
 import tombenpotter.emt.common.items.armor.wings.ItemThaumiumReinforcedWing;
 import tombenpotter.emt.common.items.armor.boots.ItemElectricBootsTraveller;
 import tombenpotter.emt.common.items.armor.boots.ItemNanoBootsTraveller;
 import tombenpotter.emt.common.items.armor.boots.ItemQuantumBootsTraveller;
+import tombenpotter.emt.common.items.armor.chestplates.ItemInfusedQuantumChestplate;
 import tombenpotter.emt.common.items.armor.goggles.ItemElectricGoggles;
 import tombenpotter.emt.common.items.armor.goggles.ItemNanoGoggles;
 import tombenpotter.emt.common.items.armor.goggles.ItemQuantumGoggles;
@@ -88,7 +88,7 @@ public class ItemRegistry {
         onering = new ItemOneRing();
         GameRegistry.registerItem(onering, "BaseBaubles");
   
-        quantumArmor = new ItemInfusedQuantum(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + ".quantum");
+        quantumArmor = new ItemInfusedQuantumChestplate(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + ".quantum");
         
         electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric");
         GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing");
diff --git a/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java b/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java
deleted file mode 100644
index 987965c..0000000
--- a/src/main/java/tombenpotter/emt/common/items/ItemShardCarver.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package tombenpotter.emt.common.items;
-
-import net.minecraft.item.Item;
-import tombenpotter.emt.ElectroMagicTools;
-
-public class ItemShardCarver extends Item {
-
-    public ItemShardCarver(int maxDamage) {
-        this.setCreativeTab(ElectroMagicTools.tabEMT);
-        this.setMaxDamage(maxDamage);
-        this.setMaxStackSize(1);
-        this.setNoRepair();
-    }
-}
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java
index a6d5628..fda4e22 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemElectricBootsTraveller.java
@@ -1,24 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- *
- * Attention: this class originally belongs to the ThaumicTinkerer mod.
- * All I did was modifying it to fulfill my needs.
- *
- * ThaumicTinkerer is Open Source and distributed under a
- * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
- * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
- *
- * http://www.minecraftforum.net/topic/1813058-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.armor.boots;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java
index b1a9c90..185c667 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemNanoBootsTraveller.java
@@ -1,24 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- *
- * Attention: this class originally belongs to the ThaumicTinkerer mod.
- * All I did was modifying it to fulfill my needs.
- *
- * ThaumicTinkerer is Open Source and distributed under a
- * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
- * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
- *
- * http://www.minecraftforum.net/topic/1813058-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.armor.boots;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java
index 845c515..e74b098 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/boots/ItemQuantumBootsTraveller.java
@@ -1,24 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- *
- * Attention: this class originally belongs to the ThaumicTinkerer mod.
- * All I did was modifying it to fulfill my needs.
- *
- * ThaumicTinkerer is Open Source and distributed under a
- * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
- * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
- *
- * http://www.minecraftforum.net/topic/1813058-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.armor.boots;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/ItemInfusedQuantum.java b/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java
similarity index 50%
rename from src/main/java/tombenpotter/emt/common/items/armor/ItemInfusedQuantum.java
rename to src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java
index 409e652..b158b60 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/ItemInfusedQuantum.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/chestplates/ItemInfusedQuantumChestplate.java
@@ -1,4 +1,4 @@
-package tombenpotter.emt.common.items.armor;
+package tombenpotter.emt.common.items.armor.chestplates;
 
 import cpw.mods.fml.common.eventhandler.EventBus;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -34,6 +34,8 @@ import tombenpotter.emt.ModInformation;
 import tombenpotter.emt.client.model.ModelCpecialArmor;
 import tombenpotter.emt.client.model.ModelWings;
 import tombenpotter.emt.common.items.ItemRegistry;
+import tombenpotter.emt.common.items.armor.wings.ItemNanoWing;
+import tombenpotter.emt.common.items.armor.wings.ItemQuantumWing;
 import tombenpotter.emt.common.util.ConfigHandler;
 import tombenpotter.emt.common.util.RandomHelper;
 import tombenpotter.emt.common.util.TextHelper;
@@ -55,13 +57,14 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.FoodStats;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 import net.minecraftforge.common.ISpecialArmor.ArmorProperties;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
 
-public class ItemInfusedQuantum extends ItemArmorElectric {
+public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
 	
 	IIcon icon0;
 	IIcon icon1;
@@ -74,13 +77,10 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
 	public static AudioSource audioSource;
 	private static boolean lastJetpackUsed = false;
 	
-	public ItemInfusedQuantum(InternalName internalName, int armorType1) {
-		super(internalName, InternalName.quantum, armorType1, 2000000, 12000.0D, 4);
-		
+	public ItemInfusedQuantumChestplate(InternalName internalName, int armorType) {
+		super(internalName, InternalName.quantum, armorType, 2000000, 12000.0D, 4);
 		MinecraftForge.EVENT_BUS.register(this);
-
 		this.setCreativeTab(ElectroMagicTools.tabEMT);
-
 		potionRemovalCost.put(Integer.valueOf(Potion.poison.id), Integer.valueOf(10000));
 		potionRemovalCost.put(Integer.valueOf(IC2Potion.radiation.id), Integer.valueOf(10000));
 		potionRemovalCost.put(Integer.valueOf(Potion.wither.id), Integer.valueOf(25000));
@@ -136,153 +136,135 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
 		byte toggleTimer = nbtData.getByte("toggleTimer");
 		boolean ret = false;
 
-		IC2.platform.profilerStartSection("QuantumBodyarmor");
-
 		boolean jetpack = nbtData.getBoolean("jetpack");
 		boolean hoverMode = nbtData.getBoolean("hoverMode");
 		boolean jetpackUsed = false;
 		String useother = nbtData.getString("useother");
 		
-		if(!useother.equals("TW") && !useother.equals("NW") && !useother.equals("QW") && !useother.equals("Jetpack") && !useother.equals("None")){
-			nbtData.setString("useother", "None");
-		}
+		if(!world.isRemote){
 		
-		if ((IC2.keyboard.isJumpKeyDown(player)) && (IC2.keyboard.isModeSwitchKeyDown(player)) && (toggleTimer == 0)) {
-			toggleTimer = 30;
-			hoverMode = !hoverMode;
-			if (IC2.platform.isSimulating()) 
-			{
-				nbtData.setBoolean("hoverMode", hoverMode);
-				if (hoverMode) 
+			if(!useother.equals("TW") && !useother.equals("NW") && !useother.equals("QW") && !useother.equals("Jetpack") && !useother.equals("None")){
+				nbtData.setString("useother", "None");
+			}
+		
+			if ((IC2.keyboard.isJumpKeyDown(player)) && (IC2.keyboard.isModeSwitchKeyDown(player)) && (toggleTimer == 0)) {
+				toggleTimer = 30;
+				hoverMode = !hoverMode;
+				if (IC2.platform.isSimulating()) 
 				{
-					IC2.platform.messagePlayer(player, "Hover Mode enabled.", new Object[0]);
-				} else 
-				{
-					IC2.platform.messagePlayer(player, "Hover Mode disabled.", new Object[0]);
+					nbtData.setBoolean("hoverMode", hoverMode);
+					if (hoverMode) 
+					{
+						IC2.platform.messagePlayer(player, "Hover Mode enabled.", new Object[0]);
+					} else 
+					{
+						IC2.platform.messagePlayer(player, "Hover Mode disabled.", new Object[0]);
+					}
 				}
 			}
-		}
 		
-		if(player.inventory.getCurrentItem() != null){
-			if(IC2.keyboard.isSneakKeyDown(player) && (player.inventory.getCurrentItem().getUnlocalizedName().equals("ic2.itemArmorJetpackElectric")) && toggleTimer == 0 && useother.equals("None")){
-				toggleTimer = 30;
-				if (IC2.platform.isSimulating()) {
-					player.inventory.armorInventory[2].stackTagCompound.setBoolean("jetpack", true);
+			if(player.inventory.getCurrentItem() != null && player.isSneaking() && toggleTimer == 0 && useother.equals("None")){
+				if(player.inventory.getCurrentItem().getItem() == IC2Items.getItem("electricJetpack").getItem()){
+					nbtData.setBoolean("jetpack", true);
 					IC2.platform.messagePlayer(player, "Jetpack enabled.", new Object[0]);
-					if(player.inventory.armorInventory[2] == itemStack){
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "Jetpack");
-						player.inventory.armorInventory[2].stackTagCompound.setInteger("jetpackCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem()));
-						player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
+
+					nbtData.setString("useother", "Jetpack");
+					int charge = (int)ElectricItem.manager.getCharge(itemStack);
+					if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < 30000){
+						ElectricItem.manager.use(itemStack, 30000 - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player);
 					}
+					nbtData.setInteger("jetpackCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
+
 				}
-			}
-		}
-		
-		if(player.inventory.getCurrentItem() != null){
-			if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing && toggleTimer == 0 && useother.equals("None")){
-				toggleTimer = 30;
-				if (IC2.platform.isSimulating()) {
+			
+				else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.thaumiumWing){
 					IC2.platform.messagePlayer(player, "Thaumium wings enabled.", new Object[0]);
-					if(player.inventory.armorInventory[2] == itemStack){
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "TW");
-						player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
-					}
+					player.inventory.armorInventory[2].stackTagCompound.setString("useother", "TW");
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
 				}
-			}
-		}
-		
-		if(player.inventory.getCurrentItem() != null){
-			if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing && toggleTimer == 0 && useother.equals("None")){
-				toggleTimer = 30;
-				if (IC2.platform.isSimulating()) {
+			
+				else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.nanoWing){
 					IC2.platform.messagePlayer(player, "Nano wings enabled.", new Object[0]);
-					if(player.inventory.armorInventory[2] == itemStack){
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "NW");
-						player.inventory.armorInventory[2].stackTagCompound.setInteger("NWCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem()));
-						player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
+					player.inventory.armorInventory[2].stackTagCompound.setString("useother", "NW");
+					int charge = (int)ElectricItem.manager.getCharge(itemStack);
+					if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemNanoWing.maxCharge){
+						ElectricItem.manager.use(itemStack, ItemNanoWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player);
 					}
+					nbtData.setInteger("NWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
 				}
-			}
-		}
-		
-		if(player.inventory.getCurrentItem() != null){
-			if(IC2.keyboard.isSneakKeyDown(player) && player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing && toggleTimer == 0 && useother.equals("None")){
-				toggleTimer = 30;
-				if (IC2.platform.isSimulating()) {
+			
+				else if(player.inventory.getCurrentItem().getItem() == ItemRegistry.quantumWing){
 					IC2.platform.messagePlayer(player, "Quantum wings enabled.", new Object[0]);
-					if(player.inventory.armorInventory[2] == itemStack){
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "QW");
-						player.inventory.armorInventory[2].stackTagCompound.setInteger("QWCharge", (int) ElectricItem.manager.getCharge(player.inventory.getCurrentItem()));
-						player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
+					player.inventory.armorInventory[2].stackTagCompound.setString("useother", "QW");
+					int charge = (int)ElectricItem.manager.getCharge(itemStack);
+					if(ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) < ItemQuantumWing.maxCharge){
+						ElectricItem.manager.use(itemStack, ItemQuantumWing.maxCharge - ElectricItem.manager.getCharge(player.inventory.getCurrentItem()), player);
 					}
+					nbtData.setInteger("QWCharge", (int) (ElectricItem.manager.getCharge(player.inventory.getCurrentItem()) + charge - (int)ElectricItem.manager.getCharge(itemStack)));
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
 				}
 			}
+		
+			if(player.inventory.getCurrentItem() == null && player.inventory.armorInventory[2] == itemStack && nbtData.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){
+				toggleTimer = 30;
+
+				if(useother.equals("Jetpack")){
+					IC2.platform.messagePlayer(player, "Jetpack disabled.", new Object[0]);
+					player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
+		           	ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem());
+		           	if(player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge") > 0)
+		           		ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), 1, true, false);
+		           	else
+						ElectricItem.manager.charge(charged, 0, 1, true, false);
+		           	player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
+				}
+					
+				if(useother.equals("TW")){
+					IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]);
+					player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.thaumiumWing));
+				}
+					
+				if(useother.equals("NW")){
+					IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]);
+					player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
+					ItemStack charged = new ItemStack(ItemRegistry.nanoWing);
+					if(nbtData.getInteger("NWCharge") > 0)
+						ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), 3, true, false);
+					else
+						ElectricItem.manager.charge(charged, 0, 3, true, false);
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
+				}
+					
+				if(useother.equals("QW")){
+					IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]);
+					player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
+					ItemStack charged = new ItemStack(ItemRegistry.quantumWing);
+					if(nbtData.getInteger("QWCharge") > 0)
+						ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), 3, true, false);
+					else
+						ElectricItem.manager.charge(charged, 0, 3, true, false);
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
+				}
+					
+				nbtData.setBoolean("unequip", false);
+				
+			}
 		}
 		
-		if(player.inventory.getCurrentItem() == null && nbtData.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){
-			toggleTimer = 30;
-			if(player.inventory.armorInventory[2] == itemStack){
-				if(player.inventory.getCurrentItem() == null){
-					if(useother.equals("Jetpack")){
-						IC2.platform.messagePlayer(player, "Jetpack disabled.", new Object[0]);
-						jetpack = false;
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
-		            	ItemStack charged = new ItemStack(IC2Items.getItem("electricJetpack").getItem());
-		            	if(player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge") > 50)
-		            		ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("jetpackCharge"), true, false);
-		            	else
-							ElectricItem.manager.charge(charged, 50, 50, true, false);
-		            	player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
-					}
-					
-					if(useother.equals("TW")){
-						IC2.platform.messagePlayer(player, "Thaumium wings disabled.", new Object[0]);
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
-						player.inventory.setInventorySlotContents(player.inventory.currentItem, new ItemStack(ItemRegistry.thaumiumWing));
-					}
-					
-					if(useother.equals("NW")){
-						IC2.platform.messagePlayer(player, "Nano wings disabled.", new Object[0]);
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
-						ItemStack charged = new ItemStack(ItemRegistry.nanoWing);
-						if(player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge") > 1)
-							ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("NWCharge"), true, false);
-						else
-							ElectricItem.manager.charge(charged, 1, 1, true, false);
-						player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
-					}
-					
-					if(useother.equals("QW")){
-						IC2.platform.messagePlayer(player, "Quantum wings disabled.", new Object[0]);
-						player.inventory.armorInventory[2].stackTagCompound.setString("useother", "None");
-						ItemStack charged = new ItemStack(ItemRegistry.quantumWing);
-						if(player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge") > 1)
-							ElectricItem.manager.charge(charged, player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), player.inventory.armorInventory[2].stackTagCompound.getInteger("QWCharge"), true, false);
-						else
-							ElectricItem.manager.charge(charged, 1, 1, true, false);
-						player.inventory.setInventorySlotContents(player.inventory.currentItem, charged);
-					}
-					
-					nbtData.setBoolean("unequip", false);
-				}
-			}
-		}
-		
-		if ((jetpack) && ((IC2.keyboard.isJumpKeyDown(player)) && (useother.equals("Jetpack")) || ((hoverMode) && (player.motionY < -0.029999999329447746D)))) {
+		if ((IC2.keyboard.isJumpKeyDown(player) && useother.equals("Jetpack")) || (hoverMode && player.motionY < -0.029999999329447746D)) {
 			jetpackUsed = useJetpack(player, hoverMode, itemStack);
 		}
 		
-		if ((useother.equals("TW"))) {
-			useWings(player, itemStack, world, 0.15f, 0.7f, 0.5f, false);
-		}
+		if(useother.equals("TW"))
+			useWings(player, itemStack, world, 0.15f, 0.7f, 0.5f, 0, false);
+		if(useother.equals("NW"))
+			useWings(player, itemStack, world, 0.25f, 0.6f, 0.3f, 5, true);
+		if(useother.equals("QW"))
+			useWings(player, itemStack, world,  0.33f, 0.5f, 0.2f, 7, true);
 		
-		if ((useother.equals("NW"))) {
-			useWings(player, itemStack, world, 0.25f, 0.6f, 0.3f, true);
-		}
-		
-		if ((useother.equals("QW"))) {
-			useWings(player, itemStack, world,  0.33f, 0.5f, 0.2f, true);
-		}
 		
 		if ((IC2.platform.isSimulating()) && (toggleTimer > 0)) {
 			toggleTimer = (byte) (toggleTimer - 1);
@@ -308,15 +290,10 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
 			}
 		}
 		
-		if(world.isRemote){
-			getIconIndex(itemStack);
-		}
 		ret = jetpackUsed;
 
 		player.extinguish();
 
-		IC2.platform.profilerEndSection();
-
 		if (ret) {
 			player.inventoryContainer.detectAndSendChanges();
 		}
@@ -327,48 +304,38 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
 	public IIcon getIconIndex(ItemStack stack){
 		try{
 			String useother = stack.stackTagCompound.getString("useother");
-			if(useother.equals("Jetpack")){
+			
+			if(useother.equals("Jetpack"))
 				return icon1;
-			}
-			if(useother.equals("TW")){
+			if(useother.equals("TW"))
 				return icon2;
-			}
-			if(useother.equals("NW")){
+			if(useother.equals("NW"))
 				return icon3;
-			}
-			if(useother.equals("QW")){
+			if(useother.equals("QW"))
 				return icon4;
-			}
-		}
-		catch(Exception ex){
+			
 			return icon0;
 		}
-		
-		return icon0;
+		catch(Exception ex){return icon0;}
 	}
     
 	@Override
 	public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining){
 		try{
 			String useother = stack.stackTagCompound.getString("useother");
-			if(useother.equals("Jetpack")){
+			
+			if(useother.equals("Jetpack"))
 				return icon1;
-			}
-			if(useother.equals("TW")){
+			if(useother.equals("TW"))
 				return icon2;
-			}
-			if(useother.equals("NW")){
+			if(useother.equals("NW"))
 				return icon3;
-			}
-			if(useother.equals("QW")){
+			if(useother.equals("QW"))
 				return icon4;
-			}
-		}
-		catch(Exception e){
+			
 			return icon0;
 		}
-		
-		return icon0;
+		catch(Exception e){return icon0;}
 	}
 	
 	@Override
@@ -384,18 +351,15 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
     @SideOnly(Side.CLIENT)
     public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
 		String useother = stack.stackTagCompound.getString("useother");
-		if(useother.equals("Jetpack")){
+		
+		if(useother.equals("Jetpack"))
 			return ModInformation.texturePath + ":textures/models/quantum_jetpack.png";
-		}
-		if(useother.equals("TW")){
+		if(useother.equals("TW"))
 			return ModInformation.texturePath + ":textures/models/quantum_wings_t.png";
-		}
-		if(useother.equals("NW")){
+		if(useother.equals("NW"))
 			return ModInformation.texturePath + ":textures/models/quantum_wings_n.png";
-		}
-		if(useother.equals("QW")){
+		if(useother.equals("QW"))
 			return ModInformation.texturePath + ":textures/models/quantum_wings_q.png";
-		}
 		return ModInformation.texturePath + ":textures/models/quantum.png";
     }
 	
@@ -424,15 +388,17 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
     	try{
     		String useother = stack.stackTagCompound.getString("useother");
-    		if(useother.equals("Jetpack")){
-    			list.add((stack.stackTagCompound.getInteger("jetpackCharge")) + " EU JETPACK");
-    		}
-    		if(useother.equals("NW")){
-    			list.add((stack.stackTagCompound.getInteger("NWCharge")) + " EU NW");
-    		}
-    		if(useother.equals("QW")){
-    			list.add((stack.stackTagCompound.getInteger("QWCharge")) + " EU QW");
-    		}
+    		list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + tier);
+    		//list.add(ElectricItem.manager.getCharge(stack) + " EU");
+    		//if(useother.equals("Jetpack")){
+    		//	list.add(stack.stackTagCompound.getInteger("jetpackCharge") + " EU JETPACK");
+    		//}
+    		//if(useother.equals("NW")){
+    		//	list.add(stack.stackTagCompound.getInteger("NWCharge") + " EU NW");
+    		//}
+    		//if(useother.equals("QW")){
+    		//	list.add(stack.stackTagCompound.getInteger("QWCharge") + " EU QW");
+    		//}
     	}
     	catch(NullPointerException e){}
     }
@@ -441,13 +407,13 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
 		int jetpackMaxCharge = 30000;
 		
 		ItemStack jetpack = player.inventory.armorInventory[2];
-		if (stack.stackTagCompound.getInteger("jetpackCharge") == 0){
+		if (ElectricItem.manager.getCharge(stack) <= 0)
 			return false;
-		}
+		
 		float power = 1.0F;
 		float dropPercentage = 0.05F;
-		if (((float)stack.stackTagCompound.getInteger("jetpackCharge") / (float)jetpackMaxCharge) <= dropPercentage){
-			power = (float) (power * (stack.stackTagCompound.getInteger("jetpackCharge") / (float)jetpackMaxCharge) * dropPercentage);
+		if (((float)ElectricItem.manager.getCharge(stack) / (float)jetpackMaxCharge) <= dropPercentage){
+			power = (float) (power * (ElectricItem.manager.getCharge(stack) / (float)jetpackMaxCharge) * dropPercentage);
 		}
 		if (IC2.keyboard.isForwardKeyDown(player)) {
 			float retruster = 3.5F;
@@ -490,51 +456,50 @@ public class ItemInfusedQuantum extends ItemArmorElectric {
 		if (hoverMode) {
 			consume = 10.0D;
 		}
-		stack.stackTagCompound.setInteger("jetpackCharge", (int)(stack.stackTagCompound.getInteger("jetpackCharge") - consume));
+		ElectricItem.manager.use(stack, consume, player);
+		
 		player.fallDistance = 0.0F;
 		player.distanceWalkedModified = 0.0F;
 		IC2.platform.resetPlayerInAirTime(player);
 		return true;
 	}
 	
-	void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, boolean isElectric){
+	void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, int amount, boolean isElectric){
     	NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack);
-    	
-		if((nbtData.getString("useother").equals("NW") && nbtData.getInteger("NWCharge") > 0) || (nbtData.getString("useother").equals("QW") && nbtData.getInteger("QWCharge") > 0) || nbtData.getString("useother").equals("TW")){
-    	
-			nbtData.setBoolean("isJumping", IC2.keyboard.isJumpKeyDown(player));
-    		if(nbtData.getBoolean("isJumping")){
-        		nbtData.setBoolean("isHolding", true);
-        		nbtData.setInteger("f", nbtData.getInteger("f") + 1);
-            	if(nbtData.getInteger("f") > 7) nbtData.setInteger("f", 7);
-        	}
-        	else if(nbtData.getBoolean("isHolding")){
-            	nbtData.setBoolean("isHolding", false);	
-            	player.motionY = motionY * nbtData.getInteger("f");
-            	if(player.motionX < 0.7 && player.motionZ < 0.7){
-            		player.motionX /= motionXZ;
-            		player.motionZ /= motionXZ;
-            	}
-            	world.playSoundEffect(player.posX, player.posY, player.posZ, "mob.ghast.fireball", 1, 1);
-            	for(int i = 0; i < 4; i++){
-            		world.spawnParticle("cloud", player.posX - 1 + (rnd.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (rnd.nextInt(100) / 50d), 0, -0.5, 0);
-            	}
-            	nbtData.setInteger("f", 0);
-        	}
 
-        	if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0)
-        		player.motionY *= f1;
+		nbtData.setBoolean("isJumping", IC2.keyboard.isJumpKeyDown(player));
+    	if(nbtData.getBoolean("isJumping")){
+       		nbtData.setBoolean("isHolding", true);
+       		nbtData.setInteger("f", nbtData.getInteger("f") + 1);
+           	if(nbtData.getInteger("f") > 7) nbtData.setInteger("f", 7);
+       	}
+       	else if(nbtData.getBoolean("isHolding")){
+           	nbtData.setBoolean("isHolding", false);	
+           	player.motionY = motionY * nbtData.getInteger("f");
+           	ElectricItem.manager.use(stack, ((motionY * nbtData.getInteger("f")) * 100) * amount, player);
+           	if(player.motionX < 0.5 && player.motionZ < 0.5 && player.motionX > -0.5 && player.motionZ > -0.5){
+           		player.motionX /= motionXZ;
+           		player.motionZ /= motionXZ;
+           	}
+           	world.playSoundEffect(player.posX, player.posY, player.posZ, "mob.ghast.fireball", 1, 1);
+           	for(int i = 0; i < 4; i++){
+           		world.spawnParticle("cloud", player.posX - 1 + (rnd.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (rnd.nextInt(100) / 50d), 0, -0.5, 0);
+           	}
+           	nbtData.setInteger("f", 0);
+        }
 
-        	if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2;
+       	if (nbtData.getBoolean("isJumping") && !player.onGround && player.motionY < 0)
+       		player.motionY *= f1;
+
+        if (player.isInWater() && !player.capabilities.isCreativeMode) player.motionY += -0.2;
             
-        	if(ConfigHandler.impactOfRain){
-        		if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode)
-            		player.motionY = -0.3;
-        	}
-
-        	if (player.isSneaking() && !player.onGround) player.motionY = -0.6;
-        
-        	if (player.fallDistance > 0.0F) player.fallDistance = 0;
-		}
+       	if(ConfigHandler.impactOfRain){
+        	if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode)
+        		player.motionY = -0.3;
+        }
+        if (player.isSneaking() && !player.onGround) player.motionY = -0.6;
+       
+        if (player.fallDistance > 0.0F) player.fallDistance = 0;
+		
     }
 }
\ No newline at end of file
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java
index fb9ebe5..3312620 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemElectricGoggles.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.armor.goggles;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java
index 7693db8..e3763e9 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemNanoGoggles.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.armor.goggles;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java
index 46c0550..9abcf8c 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemQuantumGoggles.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.armor.goggles;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java
index d30d90f..3d751bd 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/goggles/ItemSolarHelmetRevealing.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.armor.goggles;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java
index 2784645..e7c3070 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java
@@ -2,6 +2,7 @@ package tombenpotter.emt.common.items.armor.wings;
 
 import java.util.Random;
 
+import ic2.api.item.ElectricItem;
 import ic2.core.IC2;
 import ic2.core.util.StackUtil;
 import cpw.mods.fml.relauncher.Side;
@@ -63,10 +64,10 @@ public class ItemFeatherWing extends ItemArmor {
 
     @Override
     public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
-    	updateWings(player, stack, world, 0.09f, 0.9f, 0.9f);
+    	updateWings(player, stack, world, 0.09f, 0.9f, 0.9f, 0);
     }
     
-    public void updateWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1){
+    public void updateWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, int amount){
     	NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack);
     	boolean isJmuping = nbtData.getBoolean("isJumping");
     	boolean isHolding = nbtData.getBoolean("isHolding");
@@ -83,7 +84,8 @@ public class ItemFeatherWing extends ItemArmor {
            	nbtData.setBoolean("isHolding", false);
             		
            	player.motionY = motionY * f;
-           	if(player.motionX < 0.7 && player.motionZ < 0.7){
+           	ElectricItem.manager.use(stack, ((motionY * nbtData.getInteger("f")) * 100) * amount, player);
+           	if(player.motionX < 0.5 && player.motionZ < 0.5 && player.motionX > -0.5 && player.motionZ > -0.5){
            		player.motionX /= motionXZ;
            		player.motionZ /= motionXZ;
            	}
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java
index 89c141c..f6bfd47 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemNanoWing.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectricItem, ISpecialArmor, IMetalArmor {
 
-    public int maxCharge = 100000;
+    public static int maxCharge = 100000;
     public int tier = 3;
     public double transferLimit = 1000;
     public int energyPerDamage = 100;
@@ -66,7 +66,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
 
     @Override
     public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
-    	this.updateWings(player, stack, world, 0.25f, 0.6f, 0.3f);
+    	this.updateWings(player, stack, world, 0.25f, 0.6f, 0.3f, 5);
     }
 
     @Override
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java
index 5f375a4..f441fc6 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemQuantumWing.java
@@ -13,13 +13,13 @@ import tombenpotter.emt.ModInformation;
 import tombenpotter.emt.common.util.ConfigHandler;
 
 public class ItemQuantumWing extends ItemNanoWing {
+	public static int maxCharge = 1000000;
 
     public ItemQuantumWing(ArmorMaterial material, int par3, int par4) {
         super(material, par3, par4);
         this.setMaxStackSize(1);
         this.setMaxDamage(27);
         this.setCreativeTab(ElectroMagicTools.tabEMT);
-        maxCharge = 1000000;
         visDiscount = 6;
         transferLimit = 10000;
         energyPerDamage = 1000;
@@ -39,6 +39,11 @@ public class ItemQuantumWing extends ItemNanoWing {
 
     @Override
     public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
-    	this.updateWings(player, stack, world, 0.33f, 0.5f, 0.2f);
+    	this.updateWings(player, stack, world, 0.33f, 0.5f, 0.2f, 7);
+    }
+    
+    @Override
+    public double getMaxCharge(ItemStack itemStack) {
+        return maxCharge;
     }
 }
diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java
index d40fd60..de86acb 100644
--- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java
+++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemThaumiumReinforcedWing.java
@@ -57,6 +57,6 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD
 
     @Override
     public void onArmorTick(World world, EntityPlayer player, ItemStack stack) {
-    	this.updateWings(player, stack, world, 0.15f, 0.7f, 0.5f);
+    	this.updateWings(player, stack, world, 0.15f, 0.7f, 0.5f, 0);
     }
 }
diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java
index b95d7ed..b94da92 100644
--- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java
+++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTMachines.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.blocks;
 
 import net.minecraft.block.Block;
diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java
index c171985..a78b232 100644
--- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java
+++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.blocks;
 
 import net.minecraft.block.Block;
diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java
index 0d921ff..43b6cfb 100644
--- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java
+++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEMTSolars2.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.blocks;
 
 import net.minecraft.block.Block;
diff --git a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java
index 252fb0a..6896fb9 100644
--- a/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java
+++ b/src/main/java/tombenpotter/emt/common/items/blocks/ItemBlockEssentiaGenerators.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.blocks;
 
 import net.minecraft.block.Block;
diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java
index b5e74c8..a3231f4 100644
--- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java
+++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChargeFocus.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.foci;
 
 import ic2.api.item.ElectricItem;
diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java
index 5051061..90f44fa 100644
--- a/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java
+++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemChristmasFocus.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.foci;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java
index c1aba2f..ed5ab4d 100644
--- a/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java
+++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemExplosionFocus.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.foci;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java
index 64eceb2..ca0267d 100644
--- a/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java
+++ b/src/main/java/tombenpotter/emt/common/items/foci/ItemShieldFocus.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.foci;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java
index 9cc4d30..aba73cb 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricHoeGrowth.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
@@ -55,7 +43,6 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem {
 	    this.icon = iconRegister.registerIcon(ModInformation.texturePath + ":tools/hoe_growth");
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
         ItemStack itemStack = new ItemStack(this, 1);
@@ -83,8 +70,8 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10)
     {
-    	if(ElectricItem.manager.getCharge(stack) > 50){
-    		ElectricItem.manager.discharge(stack, 50, 2, true, false, false);
+    	if(ElectricItem.manager.canUse(stack, 50)){
+    		ElectricItem.manager.use(stack, 50, player);
     		boolean did = false;
     		for (int x1 = -1; x1 <= 1; x1++) {
     			for (int z1 = -1; z1 <= 1; z1++) {
@@ -104,24 +91,23 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem {
     				{
     					Block block = world.getBlock(x, y, z);
     					int meta = world.getBlockMetadata(x, y, z);
-    					if ((block == ConfigBlocks.blockCustomPlant) && (meta == 0) && (ElectricItem.manager.getCharge(stack) + 20 <= this.getMaxCharge(stack)))
+    					if ((block == ConfigBlocks.blockCustomPlant) && (meta == 0) && ElectricItem.manager.canUse(stack, 50))
     					{
     						((BlockCustomPlant)block).growGreatTree(world, x, y, z, world.rand);
-    						ElectricItem.manager.discharge(stack, 50, 2, true, false, false);
+    						ElectricItem.manager.use(stack, 50, player);
     						Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 2);
     						did = true;
     					}
-    					else if ((block == ConfigBlocks.blockCustomPlant) && (meta == 1) && (ElectricItem.manager.getCharge(stack) + 150 <= this.getMaxCharge(stack)))
+    					else if ((block == ConfigBlocks.blockCustomPlant) && (meta == 1) && ElectricItem.manager.canUse(stack, 250))
     					{
     						((BlockCustomPlant)block).growSilverTree(world, x, y, z, world.rand);
-    						ElectricItem.manager.discharge(stack, 250, 2, true, false, false);
+    						ElectricItem.manager.use(stack, 250, player);
     						Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 2);
     						did = true;
     					}
     				}
     				else
     				{
-    					ElectricItem.manager.discharge(stack, 1, 2, true, false, false);
     					Thaumcraft.proxy.blockSparkle(world, x, y, z, 0, 3);
     				}
     				if (did) {
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java
index 47c2278..4cadd62 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemElectricThorHammer.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java
index e2938a8..f61bc1d 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammer.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java
index 33bcfe7..7c15173 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/ItemThorHammerBroken.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java
deleted file mode 100644
index 31d1eb0..0000000
--- a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaChainsaw.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package tombenpotter.emt.common.items.tools;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import tombenpotter.emt.common.items.ItemBaseChainsaw;
-import tombenpotter.emt.common.util.IRefillable;
-
-public class ItemVanillaChainsaw extends ItemBaseChainsaw implements IRefillable {
-
-    public Item repairMaterial;
-    public int repairMeta;
-    public float damageAdded;
-
-    public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = 0;
-        damageAdded = 2;
-    }
-
-    public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, float damageAdded) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = 0;
-        this.damageAdded = damageAdded;
-    }
-
-    public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = repairMeta;
-        damageAdded = 2;
-    }
-
-    public ItemVanillaChainsaw(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta, float damageAdded) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = repairMeta;
-        this.damageAdded = damageAdded;
-    }
-
-    @Override
-    public boolean canHarvestBlock(Block block, ItemStack stack) {
-        return (block.getHarvestLevel(new ItemStack(Item.getItemFromBlock(block)).getItemDamage()) <= this.toolMaterial.getHarvestLevel());
-    }
-
-    @Override
-    public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) {
-        return (stack2.getItem() == repairMaterial && stack2.getItemDamage() == repairMeta) ? true : super.getIsRepairable(stack1, stack2);
-    }
-
-    @Override
-    public boolean isRepairable() {
-        return true;
-    }
-
-    @Override
-    public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) {
-        stack.damageItem(1, attacker);
-        entityliving.attackEntityFrom(DamageSource.generic, damageAdded);
-        return true;
-    }
-}
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java
deleted file mode 100644
index f6990f2..0000000
--- a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaDrill.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package tombenpotter.emt.common.items.tools;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import tombenpotter.emt.common.items.ItemBaseDrill;
-import tombenpotter.emt.common.util.IRefillable;
-
-public class ItemVanillaDrill extends ItemBaseDrill implements IRefillable {
-
-    public ItemStack repairMaterial;
-
-    public ItemVanillaDrill(ToolMaterial material, int maxDamage, String textureName, ItemStack repairMaterial) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-    }
-
-    @Override
-    public boolean canHarvestBlock(Block block, ItemStack stack) {
-        return (block.getHarvestLevel(new ItemStack(Item.getItemFromBlock(block)).getItemDamage()) <= this.toolMaterial.getHarvestLevel());
-    }
-
-    @Override
-    public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) {
-        return stack2.isItemEqual(repairMaterial) ? true : super.getIsRepairable(stack1, stack2);
-    }
-
-    @Override
-    public boolean isRepairable() {
-        return true;
-    }
-}
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java b/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java
deleted file mode 100644
index 1c887cf..0000000
--- a/src/main/java/tombenpotter/emt/common/items/tools/ItemVanillaOmnitool.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package tombenpotter.emt.common.items.tools;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import tombenpotter.emt.common.items.ItemBaseOmnitool;
-import tombenpotter.emt.common.util.IRefillable;
-
-public class ItemVanillaOmnitool extends ItemBaseOmnitool implements IRefillable{
-
-    public Item repairMaterial;
-    public int repairMeta;
-    public float damageAdded;
-
-    public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = 0;
-        damageAdded = 4;
-    }
-
-    public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, float damageAdded) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = 0;
-        this.damageAdded = damageAdded;
-    }
-
-    public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = repairMeta;
-        damageAdded = 4;
-    }
-
-    public ItemVanillaOmnitool(Item.ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta, float damageAdded) {
-        super(material, maxDamage, textureName);
-        this.repairMaterial = repairMaterial;
-        this.repairMeta = repairMeta;
-        this.damageAdded = damageAdded;
-    }
-
-    @Override
-    public boolean canHarvestBlock(Block block, ItemStack stack) {
-        return (block.getHarvestLevel(new ItemStack(Item.getItemFromBlock(block)).getItemDamage()) <= this.toolMaterial.getHarvestLevel());
-    }
-
-    @Override
-    public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) {
-        return (stack2.getItem() == repairMaterial && stack2.getItemDamage() == repairMeta) ? true : super.getIsRepairable(stack1, stack2);
-    }
-
-    @Override
-    public boolean isRepairable() {
-        return true;
-    }
-
-    @Override
-    public boolean hitEntity(ItemStack stack, EntityLivingBase entityliving, EntityLivingBase attacker) {
-        stack.damageItem(1, attacker);
-        entityliving.attackEntityFrom(DamageSource.generic, damageAdded);
-        return true;
-    }
-}
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java
index e5fa568..db66871 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemDiamondChainsaw.java
@@ -1,24 +1,16 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.chainsaws;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
+import ic2.core.IC2;
+import ic2.core.audio.AudioSource;
+import ic2.core.audio.PositionSpec;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
@@ -42,6 +34,8 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
     public int cost = 200;
     public int hitCost = 300;
     public int tier = 2;
+    public static AudioSource audio;
+    int tick;
 
     public ItemDiamondChainsaw() {
         super(ToolMaterial.EMERALD);
@@ -130,6 +124,27 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
 
         return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset);
     }
+    
+    @Override
+    public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag)
+    {
+    	if(entity instanceof EntityLivingBase){
+    		if (IC2.platform.isRendering()) {
+    			if (flag) {
+    				if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume());
+    				if (audio != null) {
+    					audio.updatePosition();	
+    					audio.play();
+    				}
+    			} else if (!flag && audio != null) {
+    				audio.stop();
+    				audio.remove();
+    				audio = null;
+    				IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume());
+    			}
+    		}
+    	}
+    }
 
     @Override
     public boolean isRepairable() {
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java
index 7324318..40f8908 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemStreamChainsaw.java
@@ -1,25 +1,16 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- *
- * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to.
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.chainsaws;
 
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ic2.api.item.ElectricItem;
+import ic2.core.IC2;
+import ic2.core.audio.AudioSource;
+import ic2.core.audio.PositionSpec;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
@@ -40,6 +31,7 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw {
     boolean alternateClient;
     @SuppressWarnings("rawtypes")
     public static ArrayList oreDictLogs = new ArrayList();
+    public static AudioSource audio;
 
     public ItemStreamChainsaw() {
         this.efficiencyOnProperMaterial = 25F;
@@ -84,6 +76,27 @@ public class ItemStreamChainsaw extends ItemThaumiumChainsaw {
         return super.onItemUse(itemstack, player, world, x, y, z, par7, par8, par9, par10);
     }
 
+    @Override
+    public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag)
+    {
+    	if(entity instanceof EntityLivingBase){
+    		if (IC2.platform.isRendering()) {
+    			if (flag) {
+    				if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume());
+    				if (audio != null) {
+    					audio.updatePosition();	
+    					audio.play();
+    				}
+    			} else if (!flag && audio != null) {
+    				audio.stop();
+    				audio.remove();
+    				audio = null;
+    				IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume());
+    			}
+    		}
+    	}
+    }
+
     @Override
     public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) {
         World world = player.worldObj;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java
index 5dde992..85a62bd 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/chainsaws/ItemThaumiumChainsaw.java
@@ -1,22 +1,14 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.chainsaws;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ic2.api.item.ElectricItem;
+import ic2.core.IC2;
+import ic2.core.audio.AudioSource;
+import ic2.core.audio.PositionSpec;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -26,6 +18,7 @@ import tombenpotter.emt.ElectroMagicTools;
 import tombenpotter.emt.ModInformation;
 
 public class ItemThaumiumChainsaw extends ItemDiamondChainsaw {
+	public static AudioSource audio;
 
     public ItemThaumiumChainsaw() {
         this.efficiencyOnProperMaterial = 21F;
@@ -36,6 +29,27 @@ public class ItemThaumiumChainsaw extends ItemDiamondChainsaw {
         cost = 250;
         hitCost = 350;
     }
+    
+    @Override
+    public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag)
+    {
+    	if(entity instanceof EntityLivingBase){
+    		if (IC2.platform.isRendering()) {
+    			if (flag) {
+    				if (audio == null) audio = IC2.audioManager.createSource(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawIdle.ogg", true, false, IC2.audioManager.getDefaultVolume());
+    				if (audio != null) {
+    					audio.updatePosition();	
+    					audio.play();
+    				}
+    			} else if (!flag && audio != null) {
+    				audio.stop();
+    				audio.remove();
+    				audio = null;
+    				IC2.audioManager.playOnce(entity, PositionSpec.Hand, "Tools/Chainsaw/ChainsawStop.ogg", true, IC2.audioManager.getDefaultVolume());
+    			}
+    		}
+    	}
+    }
 
     @SideOnly(Side.CLIENT)
     @Override
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java
index cfda7f3..8dd6d78 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemRockbreakerDrill.java
@@ -1,17 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- *
- * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to.
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.drills;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java
index e0ee43f..b92a679 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/drills/ItemThaumiumDrill.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.drills;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java
index 79eef35..ac47746 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolDiamond.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.omnitools;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java
index ee21746..0777f1d 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolIron.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.omnitools;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java
index 355a3e7..5a6929f 100644
--- a/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java
+++ b/src/main/java/tombenpotter/emt/common/items/tools/omnitools/ItemOmnitoolThaumium.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.items.tools.omnitools;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java
index d86db0b..bd25bf2 100644
--- a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java
+++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile;
 
 import ic2.api.item.IC2Items;
diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java
index 4de8972..4121176 100644
--- a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java
+++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile;
 
 import ic2.api.energy.prefab.BasicSink;
diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java
index 9ed0058..93950a8 100644
--- a/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java
+++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile;
 
 import thaumcraft.api.nodes.NodeModifier;
diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java
index 934d44d..cd8208d 100644
--- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java
+++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityArborGenerator.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.generators;
 
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java
index 88e0c34..7662e28 100644
--- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java
+++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityAuramGenerator.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.generators;
 
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java
index 985db52..7241f72 100644
--- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java
+++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityIgnisGenerator.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.generators;
 
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java
index 9ed3f2c..1541a88 100644
--- a/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java
+++ b/src/main/java/tombenpotter/emt/common/tile/generators/TileEntityPotentiaGenerator.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.generators;
 
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java
index 0751cf0..b859dc3 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityAirSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.air;
 
 import ic2.api.energy.prefab.BasicSource;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java
index eb23105..f5a12df 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityDoubleAirSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.air;
 
 import ic2.api.energy.prefab.BasicSource;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java
index 1a379eb..5420569 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/air/TileEntityTripleAirSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.air;
 
 import ic2.api.energy.prefab.BasicSource;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java
index ae5be2b..ef16231 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityCompressedSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.compressed;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java
index 9fd7e32..34fa068 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityDoubleCompressedSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.compressed;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java
index 153c6fe..da425ce 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/compressed/TileEntityTripleCompressedSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.compressed;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java
index 7020c4e..54dd0b0 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDarkSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.dark;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java
index bb09fb7..cd2847a 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityDoubleDarkSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.dark;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java
index 459da91..4b05b75 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/dark/TileEntityTripleDarkSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.dark;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java
index 2f0cef9..de0adf6 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityDoubleEarthSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.earth;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java
index 3aab9de..b9b4a2c 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityEarthSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.earth;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java
index 4499b3c..4ceee2c 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/earth/TileEntityTripleEarthSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.earth;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java
index dff97e1..77dd392 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityDoubleFireSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.fire;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java
index 1912151..f559da3 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityFireSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.fire;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java
index 23f8c97..ffe625b 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/fire/TileEntityTripleFireSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.fire;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java
index fa204cf..17c3013 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityDoubleOrderSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.order;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java
index 4a84d04..af0671e 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityOrderSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.order;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java
index 12f9e3f..c14b12b 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/order/TileEntityTripleOrderSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.order;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java
index a24effa..9df0407 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityDoubleWaterSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.water;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java
index 075979f..465bbe8 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityTripleWaterSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.water;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java
index ce62a7f..e20c134 100644
--- a/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java
+++ b/src/main/java/tombenpotter/emt/common/tile/solars/water/TileEntityWaterSolar.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.tile.solars.water;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java b/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java
index a4c14b0..96dbabe 100644
--- a/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java
+++ b/src/main/java/tombenpotter/emt/common/util/CraftingAspects.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.util;
 
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java
index 1aa8625..2ce43f9 100644
--- a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java
+++ b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.util;
 
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java
index 06841db..13f5356 100644
--- a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java
+++ b/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java
@@ -1,24 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- *
- * Attention: this class originally belongs to the ThaumicTinkerer mod.
- * All I did was modifying it to fulfill my needs.
- *
- * ThaumicTinkerer is Open Source and distributed under a
- * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
- * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
- *
- * http://www.minecraftforum.net/topic/1813058-
- ******************************************************************************/
-
 package tombenpotter.emt.common.util;
 
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java
index ac5bd58..059d0e0 100644
--- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java
+++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.util;
 
 import java.util.Random;
@@ -29,7 +17,6 @@ import tombenpotter.emt.ElectroMagicTools;
 import tombenpotter.emt.ModInformation;
 import tombenpotter.emt.client.EMTKeys;
 import tombenpotter.emt.common.items.ItemRegistry;
-import tombenpotter.emt.common.items.ItemShardCarver;
 import tombenpotter.emt.common.network.PacketEMTKeys;
 import tombenpotter.emt.proxies.ClientProxy;
 
@@ -56,20 +43,10 @@ public class EventHandlerEMT {
             ElectroMagicTools.logger.info("Refreshing configuration file.");
         }
     }
-
-    @SubscribeEvent
-    public void onCraftedEvent(PlayerEvent.ItemCraftedEvent event) {
-        for (int i = 0; i < event.craftMatrix.getSizeInventory(); i++) {
-            if (event.craftMatrix.getStackInSlot(i) != null && event.craftMatrix.getStackInSlot(i).getItem() instanceof ItemShardCarver && event.player != null) {
-                event.craftMatrix.getStackInSlot(i).stackSize = 2;
-                event.craftMatrix.getStackInSlot(i).damageItem(1, event.player);
-            }
-        }
-    }
     
     @SubscribeEvent
     public void clientTick(ClientTickEvent e) {
-    	if(EMTKeys.getKey("UnEquip").getIsKeyPressed()){
+    	if(EMTKeys.keyUnequipPressed()){
     		ElectroMagicTools.INSTANCE.sendToServer(new PacketEMTKeys());
     	}
     }
diff --git a/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java b/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java
index 16ffe30..c531bbd 100644
--- a/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java
+++ b/src/main/java/tombenpotter/emt/common/util/ResearchAspects.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.common.util;
 
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java
index 706307c..8ce49d5 100644
--- a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java
+++ b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java
@@ -1,24 +1,12 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.proxies;
 
 import org.lwjgl.input.Keyboard;
 
+import net.minecraft.client.renderer.entity.RenderSnowMan;
 import net.minecraft.client.settings.KeyBinding;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import tombenpotter.emt.client.EMTKeys;
-import tombenpotter.emt.client.renderer.RenderArcher;
 import tombenpotter.emt.client.renderer.RenderLaser;
 import tombenpotter.emt.common.entities.EntityArcher;
 import tombenpotter.emt.common.entities.EntityLaser;
@@ -33,6 +21,6 @@ public class ClientProxy extends CommonProxy {
 
     public void registerRenders() {
         RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser());
-        RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderArcher());
+        RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderSnowMan());
     }
 }
diff --git a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java
index dc1293d..dfb2402 100644
--- a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java
+++ b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java
@@ -1,15 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2014 Tombenpotter.
- * All rights reserved. 
- *
- * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0
- * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html
- *
- * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod.
- * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012.
- * http://www.minecraftforum.net/topic/1585216-
- ******************************************************************************/
-
 package tombenpotter.emt.proxies;
 
 import cpw.mods.fml.common.network.IGuiHandler;
diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang
index 048bf00..dfbdc2c 100644
--- a/src/main/resources/assets/electromagictools/lang/en_US.lang
+++ b/src/main/resources/assets/electromagictools/lang/en_US.lang
@@ -11,6 +11,7 @@ gui.EMT.wandRecharge.title=Industrial Wand Recharge Station
 gui.EMT.inventory=Inventory
 gui.EMT.book.aspect.output.eu.title=Essentia Outputs Book
 gui.EMT.book.aspect.output.essentia.eu=EU Output per Essentia
+gui.EMT.key.unequip=Unequip
 
 #=============Tooltips=============
 #This comes after a player name. The 's is depicting ownership.
@@ -57,45 +58,34 @@ item.EMT.emtitems.denseIronSheet.name=Dense Iron Sheet
 item.EMT.emtitems.taintedFeather.name=Tainted Feather
 item.EMT.emtitems.thaumiumWing.name=Thaumium Reinforced Wing
 item.EMT.emtitems.uumatterDrop.name=Crystallized UU-Matter Drop
-
 item.EMT.emtbauble.euMaker.armor.name=Armor Charging Ring
 item.EMT.emtbauble.euMaker.inventory.name=Inventory Charging Ring
 item.EMT.item.bauble.oneRing.name=The One Ring
-
 item.EMT.goggles.electric.name=Electric Goggles of Revealing
 item.EMT.goggles.nano.name=Nanosuit Goggles of Revealing
 item.EMT.goggles.quantum.name=Quantum Goggles of Revealing
 item.EMT.goggles.solar.name=Solar Goggles of Revealing
-
 item.EMT.boots.traveller.electric.name=Electric Boots of the Traveller
 item.EMT.boots.traveller.nano.name=Nanosuit Boots of the Traveller
 item.EMT.boots.traveller.quantum.name=Quantum Boots of the Traveller
-
 item.EMT.scribingtools.electric.name=Electric Scribing Tools
-
 item.EMT.wing.feather.name=Feather Duct-Taped Wings
 item.EMT.wing.thaumium.name=Thaumium Reinforced Wings
 item.EMT.wing.nano.name=Nanosuit Wings
 item.EMT.wing.quantum.name=Quantum Wings
 ic2.EMT.quantum=Infused Quantum Chestplate
-
 item.EMT.hammer.broken.name=Broken Relic of Mjolnir
 item.EMT.hammer.name=Mjolnir
 item.EMT.hammer.electric.name=Supercharged Mjolnir
-
 item.EMT.drill.thaumium.name=Thaumium Drill
-
 item.EMT.chainsaw.diamond.name=Diamond Chainsaw
 item.EMT.chainsaw.thaumium.name=Thaumium Chainsaw
-
 item.EMT.omnitool.iron.name=Iron Omnitool
 item.EMT.omnitool.diamond.name=Diamond Omnitool
 item.EMT.omnitool.thaumium.name=Thaumium Omnitool
-
 item.EMT.chainsaw.stream.name=Chainsaw of the Stream
 item.EMT.drill.rockbreaker.name=Drill of the Rockbreaker
 item.EMT.hoeofgrowth.electric.name=Electric Hoe of Growth
-
 item.EMT.focus.explosion.name=Wand Focus: Explosion
 item.EMT.focus.christmas.name=Wand Focus: Kris-tmas
 item.EMT.focus.shield.name=Wand Focus: Shield
diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang
index 5830b59..aef5418 100644
--- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang
+++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang
@@ -11,6 +11,7 @@ gui.EMT.wandRecharge.title=Промышленная станция зарядк
 gui.EMT.inventory=Инвентарь
 gui.EMT.book.aspect.output.eu.title=Книга выхода эссенции
 gui.EMT.book.aspect.output.essentia.eu=Выход EU за эссенцию
+gui.EMT.key.unequip=Снять
 
 #=============Tooltips=============
 #This comes after a player name. The 's is depicting ownership.
@@ -57,45 +58,34 @@ item.EMT.emtitems.denseIronSheet.name=Плотный железный лист
 item.EMT.emtitems.taintedFeather.name=Заражённое перо
 item.EMT.emtitems.thaumiumWing.name=Укреплённое таум-крыло
 item.EMT.emtitems.uumatterDrop.name=Кристаллизированная капля материи
-
 item.EMT.emtbauble.euMaker.armor.name=Кольцо для зарядки брони
 item.EMT.emtbauble.euMaker.inventory.name=Кольцо для зарядки инвентаря
 item.EMT.item.bauble.oneRing.name=Кольцо Всевластия
-
 item.EMT.goggles.electric.name=Электрические очки откровения
 item.EMT.goggles.nano.name=Нано-очки откровения
 item.EMT.goggles.quantum.name=Квантовые очки откровения
 item.EMT.goggles.solar.name=Солнечные очки откровения
-
 item.EMT.boots.traveller.electric.name=Электрические ботинки путешественника
 item.EMT.boots.traveller.nano.name=Нано-ботинки путешественника
 item.EMT.boots.traveller.quantum.name=Квантовые ботинки путешественника
-
 item.EMT.scribingtools.electric.name=Электрическая чернильница с пером
-
 item.EMT.wing.feather.name=Склеенные крылья из картона
 item.EMT.wing.thaumium.name=Укреплённые таум-крылья
 item.EMT.wing.nano.name=Нано-крылья
 item.EMT.wing.quantum.name=Квантовые крылья
 ic2.EMT.quantum=Наполненный квантовый нагрудник
-
 item.EMT.hammer.broken.name=Сломанная реликвия Мьёлнира
 item.EMT.hammer.name=Мьёлнир
 item.EMT.hammer.electric.name=Сильнозаряженный Мьёлнир
-
 item.EMT.drill.thaumium.name=Таум-бур
-
 item.EMT.chainsaw.diamond.name=Алмазная электропила
 item.EMT.chainsaw.thaumium.name=Таум-электропила
-
 item.EMT.omnitool.iron.name=Железный мультиинструмент
 item.EMT.omnitool.diamond.name=Алмазный мультиинструмент
 item.EMT.omnitool.thaumium.name=Таум-мультиинструмент
-
 item.EMT.chainsaw.stream.name=Электропила Потока
 item.EMT.drill.rockbreaker.name=Бур Камнелома
 item.EMT.hoeofgrowth.electric.name=Электрическая мотыга Роста
-
 item.EMT.focus.explosion.name=Набалдашник: Взрыв
 item.EMT.focus.christmas.name=Набалдашник: Рождество
 item.EMT.focus.shield.name=Набалдашник: Щит
diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png
deleted file mode 100644
index c8995c7ff84a8beb2e2cfa2e355fdb73b6ff67cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5261
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

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png
deleted file mode 100644
index 68c7fe501e6e958d47fe57934b571ac397efbb5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1053
zcmV+&1mgRNP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00004XF*Lt006O%
z3;baP00009a7bBm000ia000ia0czHX2><{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMHD!e|WdHyJn@L1LR7gvmmRnB~Q4~h|7v<5&rBE)VK%p%lB7uKmG?)kkt5GAy
z2Ol&F5~C=_8Wm824<M)*Lc){Z?6uEuXbE0cPMVqNnQzUx&SYBJvXsG6rC2Jf^bHgX
z1I6<2$mrN5mHuLp(%z9%$#r$BbaZy943CbDPfSvDWaaYs<WySDUue!0hf4R2$0vDi
z+zLDlyfwZUZ;YqLZR4tOJ#a!GJUgU=8_Yra;^HC#kqShkprflh)06M@c%xAOb%NC4
z*`WmjhmfGTr6m#E2}~HIh>ynCz~SK`6?S)be?)9-Y%B+;a4ql;g8lvd{}(I-UK>kG
zO9+S-N(Zj%fM_Wpb_fPwdU`q$Xy$qR!h)hx*4Nib-!$q3LKi*W1hFF(XeuWH`X?4B
zy-olKwzjs?>wAXMS65d(etCI*eqQN`AlI2G^ba5qak_{F9HauSkS>&ds-UH{Eu(dN
z&p_bWhUF)@9Edf;Pa>p@9XA5U0$ZdHJvc;*odBn22t=(`lS98Ak3d~Sy7+ATjPUrK
zo$m&M?d@%H)j6bpG88S;4b^H@>H5_G9}Bb^&lVgV9g(XkMAr+RUEr`mOazb!N|g$0
zU97CENWjeVfW18?rP5=8;9s={c(@ma$5*RK7fHa}5UfK#3D7M>$8g;%1xV0Nbu7?E
zuiY*Fo8uIMJT-#rUMWBVyP*WF*>)EImA)Cj40SFYa$pcmccopFER(R*senMZ;AH>-
zlR<C~C|y48SGrD>&iEq`)Qkm;!LY|0o?WYv#SGz2LAU6@+H;_ED!3smNkwbpaly#N
zu}6l|&ARx+pepwhlnO`}{42Dpr|Ci=ws|gecJ~|$L@dx-jGL_+{7LCUk3T6$-yC`Z
z(uE7283;ZY2*mq<?o?1LVEPjcv`;9SCr$==VsZ+BARTCj#~ZOg9a1OIuzCF28a?5H
z!E#0WXrq7@yfP5zA_8p*HlmyKo<INyl&(EgUr;Upq9GQr#p+@#@N7ek^LRr7djpt2
zTgA-G3<B06-y@*h)S*)<#E+j0ag<Jl*??a7E&%=}8tl;>ol*e-{8=zqD*M^&?A+Yk
z-GF8SFAcT#fuUCwT_hMYp$%BDON*O^qOKU-`TSXe)X^vqe=E>;HR&mh0&!{!NPlO<
z0@B5~rY8S<@98b5wC6fi_%zpdYf^M-r7}E{FZ5CLy-XP@SF}zkeEL&bvspzarK#yR
Xb*Cv`mbI>o00000NkvXXu0mjf%(Bcm

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png
deleted file mode 100644
index 454852c3c70c363d0678143a4fd467ed89701e96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4735
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

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png
index 797aa005ddb172ededa23ef3b51ce716cf6c0646..0c7a36f045bf9d23c64e4861fa90d13394d60cea 100644
GIT binary patch
literal 1421
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WMyDrW(e>JaaCZ@R%X;uW7Jb&(o<*BS7$U-XEIP{HqvA?)?hZ&U^3EVGS*}?
z(PT8$WHQlUG1g=;(P1{%WVFy_0wOCtCTo308+~Sb9Tp1%Mmqy$8$)J0115VzR$F6M
zdqZ}66COKLVLLMsdt(MCLna3!W=CTd2V)jT6J}>K23K=tHxpI|6IN$a7B>qfR||G`
zOD0cCW-luyZwporOBPQ{RxfKdFDn)wTLwQ{W<Oh2UpsbxD?S$+Zg*=w4?7NDJElNe
zmH>N}AX6bnb0H@)5eExlXG<X$OHpSF5f^I_cN<Z68!<N<F?SnbPdia>J8=&uHh%|(
z5J#3EN0wj*wg4yA5GR&UC-x9G=1>==a2J+v7xqv$rf4^&SXcH4clLNsh8S=5XfM`y
zZ?<?}ws<G802he>cZpzEsUTPBV0Vd7Pl*UG=_p^RXkV!qU)gA1`DkCJ1Yec}U$#Vl
zwv<4Yv;el$0M?8!hU^e#Aj%D4%L--758+4;=gf^@%?@KJ3}-8dVlIndEr?<*jA1Q}
zWh;wfu8d`?jAN^b<S2^bD2d`J3zSX{l1&ViPl=Yzk5$f1Vy;SLu1@8uO_#4pR4PhS
zuFBS|EsWzUju$9R6ijAqNZ@S9Vr$IdY|rKBDrW94<D68<HlvbfYOzdbo%qyDrN%<_
z_EP=cTHT42M*WpWlWL46HRlSo7YKJ03U?L>_Y@2Fl!#2O6rNBiJ-J$DdX@CdDxq0b
z!ZT_G=hlkOs}pTto88PgznOVO8{6sz&PAP^>pJ9@H)u|4(wf^~G_~1iMw8L(Zk=VF
z`m1{N*K`^!ny9;KlF{lJMjK}v?U`%1W3kE6rKU&bG>Xq_kzCjywzx@rX^Z5tF6qtv
z61%2I?wKaJe}>e78ItFhh@Dy>d2O}au>~qO*C{^UrrbYaIWRF(3m6t2I0!V0v%n*=
zn1O-sFbFdq&tH)O6qG1&jVKAuPb(=;EJ|f4NX*PD(aTFMQ83Xn&@=nflYAeT!9IDq
zIEGmGCs(*J2rNzbw#+wrTh5(|x3}7Oi!W3vux|c-Z*TScdvmS*=iS*^T+64$zb4`K
z<HPLh-dLApoNRUVexK*`)KOH%rXtloBE!&w(TIP|gIkkNi}%m5tbKLollSxa_dp7C
z=2Wj)y0z%l#gm^Mxh7O5u+Dy8Zn{oGPjB_?ix)n>(9+^xwO~!kB4;0uOD$KFCNQPQ
zg*fKa%wM^8lVjWhR*<o)6wYY5hx$hAIG^WP!Z4FPbi(Ac=TD!#%%41uJE-AIvzEb?
z504){e(-%l5TmBUvqsT3RV%b!ol`w<XswFk_a|yV8ysRz%<P`n8$B_W1!O{4!Q+X2
zd$@&-)wgTUfAd&&h0O}4Qo(XQwy-)?$3(Cj8mBE$*Vo_Q(9d#%1>~f<ZEO3t=QlW|
zF@l`*>O{e58_B@PmpZY+6O<=b2C!;g{QGRyv0trjf(ooBY&JCYmQQM4#@=pa<-4h`
zW{2oh_RtGqTa6U8^zzb@G{J$DaC$Fma9DYG$@O(w>+3g21C<nfd$Vb>`Zc-v+tOqq
zYW}|M>zjP`?c2TCv$EdhxB$cR%xkNgoI<PEv_U>SbL;1ikIn4-@^-aVzrW49xdLc&
z`sQu<_xD!6z81ax+Ise`1)mOZePCkZnrF+*&@r(+vb9aO8I%M)UHx3vIVCg!0PCR6
A)&Kwi

literal 2091
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
Ax&QzG

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png
deleted file mode 100644
index 5f564413d16c7c0db151053ff22bf28380b51335..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1265
zcmV<N1P=R&P)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMHD!e|WdHyKZ%IT!R7gv;mS0aIR~U!;Szyi?rpDAkfwim~L_lV6`0ETH?x2Ep
zDC(}&8f7)Of=epy#$^RX5SO*ONt-m=O?t6SdeNIEz3WHnOV1=7jHc(N$&<O5{NDGO
zbI#0}^Vvz`45-x`!0VHGquIKH^Y*_O?w_{WK&x{Jv@g5BMfd6!y5K&H?e2rLzE=PV
zXjE%93;8dO3Ow-gnH8vR^FX^|2M)J*U}t5Bbfig=?x55KP}441Ki2KQFO42Q*L(c=
z-U)m-u>+m*FjUefbpe^j*G0##7mupk`wF`120oS9W|`{%MYhopekh>h;y@ibRtr3R
z5(MWLoj$>L><s{A6|Q}&Y?rGU1vE+M-V-$29RQ{e26!ocY6>5#&UdeTH&x&Dk*8bp
zUYADdE&qp_aP!wsW8EVMeUdC#pJ0<aTE*oT6Rjn@rQz+YY2)eVrLw!eiuTso1EYW@
zsSC&yy)5vsTzSiW7H_XVJW%oSW4t_%*D~DN+SuL_-q5&bf82a|elS9xB%S*Nb9hZ<
zSG3WsC^M&6vNB$nwP;!A6P3-Y%(78Hle|NaV6?bpY0j}4#HlE!iY7V8%%~1cX4QyE
zH412wcL-#hiC{HlTN02g;%UHV4kv935)%)xDWiZUsSC&=ld>7xl02La4JJd@q{J(d
zRf$?>LxYN9OQ#%~Q9zR<dsm+zh*Ba_!u*WeEV>!7cg14Rs!XD=pP4oaXp*{s4CHK&
z|LwvK<MlG35U-3gf(MH(#y7!;Q`VRlOCpZJ+u5zy>63l0DJk=znA<D`czGNNV`h(w
znRFvDz(-w3fObX!O;Q(-DY|?y0^<^~;<v;kUUr$ij~MSb^26|_tkY2J#}U{e8hZ}<
zWc{=W+!DxM6bkYR%&F7lahd%vvoLTElDv%6FZl1IE+AVHDU(oQ(j0}gnlK04=D;`>
zfyi*egQZ&|ph@bBY!s+=EosY!2a@68MA!<~WOO7c4n*Vjd397X3TTpj0<v^6&PI?5
z#gk0TheGfyeiV&676LdC#52Z4rb*r*m}T<{UYs9Y3E{_6rnrQYk|n7+wGcBaTQWug
zO;Q(-GXeZm;kTE<`Ds&T<zYd_^V4iPg3~cPpBvkZTGRx}Lf<#V-tU((slTR1frfW7
zXk*)Tn6%^-W--a+;!JMCU79gzD*MDJph@-#;BWvNz_;At3VL4h*1qBjY5Wabv+UN6
z?^T+8y2x$*{&u)g8lq3$A*c!+pzxqt7Mc~IQ50%rp}ywaFAB%|Ld__kN%jdUoBWT*
zHVqYliqO>1ZjSAt4eUbABD<Ag*Wo+@^FyE1KQyCYnJeemeJIPZMPpe8ZQc^lBy~Z%
z^A_0tdhm3QhYtjR0Rpg40Q|lI=m@k*RycLhC-o_U?&O#Um2aLu0D99`8iLmVfWrX*
zPYpl~*|=zuq<c?5x)VC@zVC5$4UjwJNK2;itbG9x2N^f{ND1UV`M5}H@+0_v1pm+z
bwAz0IJb5-Hr-G7L00000NkvXXu0mjflY&ci

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png
deleted file mode 100644
index a6d05e5366d50b0547e41e3f0b69d7be8900dfff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5236
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
a*&&-OQjjk<a~m*(5Z$XrTBTPUqyGmV_7&Cu

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png
deleted file mode 100644
index d902d48c6ba571b109885b3e454a7ac85874982c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5431
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

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png
deleted file mode 100644
index b3e65823c12314d4579b57ea0b802536db6742c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5120
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

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png
deleted file mode 100644
index f9515c642e8a4c4ba865635b7a13f7853cd84a4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1122
zcmV-o1fBbdP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00004XF*Lt006O%
z3;baP00009a7bBm000iZ000iZ0XPLyBme*a7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMHD!e|WdHyJ;7LS5R7gv;mP=1lK^TVn7wyu>wcN_B&=wHU;E!;jE26<fFo*_;
z7#1urQZ)oGh#0I?xx|PUC?O`SeCB)SOb?Y3Ha__>oim+z-<dgcIf?qlroL=mk;&$W
z?%qsSZzeY|I5d2P=*eUh&8ZfmrLCPvwYCuhL&L<#wNZi}i>t)Q=yl@ar8>eHJc(G0
z@zQu<JT&I#=WpD+MHC8!uf{v$x$(%jZQPA;2ATeBEp;Jvh#SN`Bn?s*rx<{jH>7^f
z5qO7xMv!W2cLp;vGpLiQ{d;3|b@h{>!k<RSm&;}4U!6pScOslYN4gVfp}&KHJXBcA
zV1Iuf-D0s=DwS#)%+1ZAPWm<mGqb(Dy=zE4h>{U1M_Skz983=Cq;>W6305A`!fQwB
z!2qOHWgxu#Ndw^x)O}KPKg8JD+LAgMA%mTr9X<XsynLy|l*SFl$HyxM!mXIdV{>ye
zD4reP4ZXAV^>qxUrlw?&YH3ZdZ)ay`Q74rFpiakWtPuo08~!1JYK#Nvz`cn2hDL87
z)Fag62Em4m3{-+>sK6=$q{$OrUItw~z3d>=!#+AVIQV9e-`m^!9YY38h)upDZU9nX
zieP$rx?;d?B>iGwAP*V%wNfr0A0NAc?Cz4M9CcC|@Y=mYvB(UcFv#Zfc33&y7=H}f
z(^9F_$;dz@`is#hrDrl&US398u!5WcHEIQ0TGJwFY{EEHPKBx_@%Zls4Nc7nZW4cf
zE-q3Vei(;`htyzlNtuwNqa!ksCWB3Uir6vK0aeg>4$dH(A6SWyf!4BwNYxTQu;y+Y
zlwbhCKxlz@`9eW2xne+7;#32nY4Hz+hRD8=ffSJD?5P+mEG(c-s=uEZY8j>o$jE>U
zGo}(%SX*1OvAI4Gc5*se+dC42mxqyFT3RBtVHKpVmdXS)hp2-uI%%NMBaK?cK<cC$
z8yoBfZc3Wz%2bce4qbeL@nL|Ps2FhA$p9oRJ{q(Poh3Bgz#9fh3ylD2&K^>?iu!VS
zJE|Qr0IBn0f`Q6qz;=}ZM+FAl{?ZND$?2$RKpR_DE3Xapj`DvE?CZk85#;5~U~+Pj
zlutCblP4x7P$yM;HL!D~$n~j079xepOI>;9jdHt094bUzaN&Ccp}&K=P+^rpxS#cI
zpvquuY|I<<Wph&J`M&Wuf_0{Q<Eg=2sP?Q>Rs`tu1>Le3JTOof?dh~LaD$2P+J@UI
z=5e-x)IsXvbc6T^g8DfPG(~ZBa0Yx`D>^#6np;{4eVX%8=7L9y{J>zkt2-WibN1)*
o1UpH=r+-6Jlj1@$=^~l@3pCNUP12KCLjV8(07*qoM6N<$f~?K>TL1t6

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png
index ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a..42d071aa379262b14b19dfcd271002b048db683f 100644
GIT binary patch
delta 1949
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

literal 2707
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
Bm978)

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png
deleted file mode 100644
index 39b5f9b5030a498c42f35792c24cef3cf430d549..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1967
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
BoVx%3

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png
index efe16f069bd8bbe6bb1063c3a9fb7685a48554f4..a0e5a5714ee5cfc5555ac36adc5e36bb13878650 100644
GIT binary patch
delta 1653
zcmV-*28#LR6ow6uB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id
z000id0mpBsWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9sw_en%S
zR7gv`mF-VjR{+NG+<UIK+BB^%D0RM6sUV>E2J$W-2uMW~L4O3rq13neR-{$28f{%`
ztBr15yLRikF6-80Ted7qmMmMcecFe8*|#P8ynkemxs9U+vwoOMez`G+<N0x)bIyZk
zZ~w)K@;?f$#LnEDEdaZzB5>zQA^0GDz^6A#1caFw*<C!!(=7?uUnv8NBWDkneJQ}|
zkJAO;?UjO`AAg+(KR%Fv-<}=t$CniXSL5gK&lvgT(NX^V`U3d%nG`%-FFtg<6x?5Z
z10SUM4^zy;`|59!+)k3;2Q%C@*it?oWzs)Al-x-c;tOKt7{8oW?v3#)F)kV7!F+;W
zN~`vxd~%SR$IQFQ!YqO%?h$|>#orSIQ*>*B-&~dNMSsXbreJ_hFUW32=v<giNBOxZ
zHzNo_%uIH{qqTFtKNsIue+%BOcz#d))gAR0Hxy6S<quM|w?_+73pHDReP8qW-7*A?
zC@xp0BI4<B>9xt))mi!Vq~i9b>YXV`8V-Pjv5Q#*^ZdOTZU>G8-590U2Sl^Or&2yq
zeB#22n}0+y1ulLdTs7(D!!9!D5e@oj+|MMgDz`)VGd?DfMR0$m5L-8Y5c<74su!bl
zB}x|u*@b?7+?N**RZQ5~UTpG{%@Q0KY^j-g0_7tn;<B;5X3}FL0h_3Qrf$8PzUk)^
zI2|~FSp?Y6d4A`H;^QD$7&tZ8&BlB9xRVZe%YVWq>dh3ih}zxfg9h4ZB3%~VV`qa-
zb|4{3`tptu;N6kH6tg{-zq_t@+@Cue%6rQy3Rp>>f$_N|K`phtB491{((We4+$^%_
zS(kzH7&-5tbgGLE1^97fh$OQJum=<T%~kokes<E!jW~0IZKPAjbUI4>>KsF+K+Wn+
zVt=P1N83nE&5T7yoqEm{s);*D(8~;G5#R#jift;NEX#2iHpVV2A$MO{?2;sk)%9mO
z48_h&L0eIK(`mg<Y;7;`*d&)+WqmyrLzhazc!^Q@;t%ghZZEtVksz3+cjI(@uI84T
z4B6R!Bk5}4Yz;YjeQ}3^v}6iuNn=ZqNq@#P$#a_PM4ARhugi7xRmF_N>!86b0^ID6
z){5}~z<C8iN#JDxZkE7jTM`rzMj$%^5(c<p;FAq8O63)S;Ml%W2yiC=&K1Cl;Qe%&
zfFQsVuW|(JBEVG#hpU5s1h3PkaNv1@Z7K*bf^9fLW|+seX^buh$aJhaX(s_A>3?qJ
zZ1t?6p4H>bRI^G<5Ckw)5xKfhQ%w{XnZ`O+t76*fiP2j*Xgbwxrv78wbWQmnDcc?@
zm<v~p_m+>~uHrVC#V%EzrlrW7DQGNgQ{*?P3w0W?#aQYzN;)0oz1Fk7P|f8L*+K7S
zZ__wkjnKte=?yFCH?STpb>OZla(~)%;*MIT2?+?BjEF9hhSp+pHB+x(TkDwC25Qpq
zj;_jZ8*#N$|FLbF;5Q;PHC?;rVu#J59s})a&9yZ!CPRrsmeZUmkg-i|Vw*IlQ9(3H
z#-L`+h{#tnq9;Bp4IkU4A#UC$8c)h^d1$nQ!%KKIY^R2H+9lmG+KdU9hJT}l%~!Bm
zW2r+)v~sGEikcfZODpT_t{yhho(_KS*fx!EOHn4Ztl0D9#?inQ(yJvNE$ecX1ymwk
zrl5i9t>?W;qEiw>GiPsQ9Xj?>P&(<z3p@E}7J*Q9aXt;fifXrypYEhlckWO-+ovH;
zZ$(7S8j&HA#JeK_6=SrQ_kY%lOigS%zB^X8o$e3Irk(t72Ny+{+1ph3!JCkz=at*|
z^%#*Qho!TAbYyX#uWBe$;HnH-3w-X%5OVidj|QZP(Yk8`;@P+=4YCM?vhy=DAf?*z
zGgEzZ(nrVKc`<wL06Nmb_MoOvB*IKB>+G!=Gv@k{VJmU#MLs7VNp7gpRwm@mj~&~l
zAwC)4<{=1hGXZW2`0~d)m<Sr!P7XTqP@pHCh-}uzhb^>E$M~==qK5!a{GCPcnr(_{
zC>4wxmd7FgO`8fcF><6z!N0fZ330-L{TF`&@*>C!v=$qx00000NkvXXu0mjfadj3d

literal 2661
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
F{{eyKaA*Jk

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png
deleted file mode 100644
index 192696c252de0cd21c1a4a431a4f944f0046e71f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1724
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
SGz8HA0000<MNUMnLSTY8DMGja

diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png
deleted file mode 100644
index 77fd80205a4f52de565d67bb9d514596c8b619d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5065
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