Port to 1.7. Removed not ported/ not working mods. Fixed rest.
Merge branch 'master' of https://github.com/MightyPirates/OpenComponents into MC1.7

Conflicts:
	src/api/java/appeng/api/Blocks.java
	src/api/java/appeng/api/DimentionalCoord.java
	src/api/java/appeng/api/IAEItemStack.java
	src/api/java/appeng/api/IAETagCompound.java
	src/api/java/appeng/api/IAppEngApi.java
	src/api/java/appeng/api/IAppEngGrinderRecipe.java
	src/api/java/appeng/api/ICellHandler.java
	src/api/java/appeng/api/ICellRegistry.java
	src/api/java/appeng/api/IExternalStorageHandler.java
	src/api/java/appeng/api/IExternalStorageRegistry.java
	src/api/java/appeng/api/IGridCacheRegistry.java
	src/api/java/appeng/api/IGrinderRecipeManager.java
	src/api/java/appeng/api/IItemComparisionProvider.java
	src/api/java/appeng/api/IItemComparison.java
	src/api/java/appeng/api/IItemList.java
	src/api/java/appeng/api/ILocateableRegistry.java
	src/api/java/appeng/api/ISpecialComparisonRegistry.java
	src/api/java/appeng/api/IWirelessTermHandler.java
	src/api/java/appeng/api/IWirelessTermRegistery.java
	src/api/java/appeng/api/Items.java
	src/api/java/appeng/api/Materials.java
	src/api/java/appeng/api/README.txt
	src/api/java/appeng/api/TileRef.java
	src/api/java/appeng/api/Util.java
	src/api/java/appeng/api/WorldCoord.java
	src/api/java/appeng/api/config/ActionItems.java
	src/api/java/appeng/api/config/CondenserOuput.java
	src/api/java/appeng/api/config/EnableDisable.java
	src/api/java/appeng/api/config/FullnessMode.java
	src/api/java/appeng/api/config/FuzzyMode.java
	src/api/java/appeng/api/config/IConfigEnum.java
	src/api/java/appeng/api/config/InterfaceBlockingMode.java
	src/api/java/appeng/api/config/InterfaceCraftingMode.java
	src/api/java/appeng/api/config/ItemFlow.java
	src/api/java/appeng/api/config/ListMode.java
	src/api/java/appeng/api/config/MatchingMode.java
	src/api/java/appeng/api/config/OperationMode.java
	src/api/java/appeng/api/config/PowerUnits.java
	src/api/java/appeng/api/config/RedstoneModeInput.java
	src/api/java/appeng/api/config/RedstoneModeInputOnOff.java
	src/api/java/appeng/api/config/RedstoneModeOutput.java
	src/api/java/appeng/api/config/SearchBoxMode.java
	src/api/java/appeng/api/config/SortDir.java
	src/api/java/appeng/api/config/SortOrder.java
	src/api/java/appeng/api/config/StackModeInput.java
	src/api/java/appeng/api/config/StackModeOutput.java
	src/api/java/appeng/api/config/TransferDir.java
	src/api/java/appeng/api/config/ViewItems.java
	src/api/java/appeng/api/events/AEWorldEvent.java
	src/api/java/appeng/api/events/GridErrorEvent.java
	src/api/java/appeng/api/events/GridPatternUpdateEvent.java
	src/api/java/appeng/api/events/GridStorageUpdateEvent.java
	src/api/java/appeng/api/events/GridTileConnectivityEvent.java
	src/api/java/appeng/api/events/GridTileLoadEvent.java
	src/api/java/appeng/api/events/GridTileUnloadEvent.java
	src/api/java/appeng/api/events/LocateableEventAnnounce.java
	src/api/java/appeng/api/events/MultiBlockUpdateEvent.java
	src/api/java/appeng/api/exceptions/AppEngException.java
	src/api/java/appeng/api/exceptions/AppEngTileMissingException.java
	src/api/java/appeng/api/integration/IBeeComparison.java
	src/api/java/appeng/api/me/items/IAEChargeableItem.java
	src/api/java/appeng/api/me/items/IAEWrench.java
	src/api/java/appeng/api/me/items/IMemoryCard.java
	src/api/java/appeng/api/me/items/ISpatialStorage.java
	src/api/java/appeng/api/me/items/IStorageCell.java
	src/api/java/appeng/api/me/items/IStorageComponent.java
	src/api/java/appeng/api/me/tiles/IAssemblerMB.java
	src/api/java/appeng/api/me/tiles/IAssemblerPatternProvider.java
	src/api/java/appeng/api/me/tiles/ICellContainer.java
	src/api/java/appeng/api/me/tiles/ICellProvider.java
	src/api/java/appeng/api/me/tiles/IColoredMETile.java
	src/api/java/appeng/api/me/tiles/IConfigureableTile.java
	src/api/java/appeng/api/me/tiles/IConnectionSensitive.java
	src/api/java/appeng/api/me/tiles/ICraftingTracker.java
	src/api/java/appeng/api/me/tiles/IDirectionalMETile.java
	src/api/java/appeng/api/me/tiles/IExtendedCellProvider.java
	src/api/java/appeng/api/me/tiles/IFulllyOptionalMETile.java
	src/api/java/appeng/api/me/tiles/IGridMachine.java
	src/api/java/appeng/api/me/tiles/IGridTeleport.java
	src/api/java/appeng/api/me/tiles/IGridTileEntity.java
	src/api/java/appeng/api/me/tiles/ILocateable.java
	src/api/java/appeng/api/me/tiles/IMEPowerStorage.java
	src/api/java/appeng/api/me/tiles/INonSignalBlock.java
	src/api/java/appeng/api/me/tiles/IOptionalMETile.java
	src/api/java/appeng/api/me/tiles/IOrientableTile.java
	src/api/java/appeng/api/me/tiles/IPriorityTile.java
	src/api/java/appeng/api/me/tiles/IStorageAware.java
	src/api/java/appeng/api/me/tiles/IStorageMonitor.java
	src/api/java/appeng/api/me/tiles/ITileCable.java
	src/api/java/appeng/api/me/tiles/ITileIOCable.java
	src/api/java/appeng/api/me/tiles/ITileInterfaceApi.java
	src/api/java/appeng/api/me/tiles/ITilePushable.java
	src/api/java/appeng/api/me/tiles/InterfaceCraftingPattern.java
	src/api/java/appeng/api/me/util/Grid.java
	src/api/java/appeng/api/me/util/IAssemblerCluster.java
	src/api/java/appeng/api/me/util/IConfigManager.java
	src/api/java/appeng/api/me/util/ICraftRequest.java
	src/api/java/appeng/api/me/util/ICraftWatcher.java
	src/api/java/appeng/api/me/util/ICraftingPattern.java
	src/api/java/appeng/api/me/util/ICraftingPatternMAC.java
	src/api/java/appeng/api/me/util/IGridCache.java
	src/api/java/appeng/api/me/util/IGridInterface.java
	src/api/java/appeng/api/me/util/IMEInventory.java
	src/api/java/appeng/api/me/util/IMEInventoryHandler.java
	src/api/java/appeng/api/me/util/IMEInventoryUtil.java
	src/api/java/appeng/api/me/util/ITileCraftingProvider.java
	src/api/java/appeng/api/me/util/InterfaceCraftingResponse.java
	src/api/java/appeng/api/me/util/TransitionResult.java
	src/api/java/appeng/api/movable/IMovableHandler.java
	src/api/java/appeng/api/movable/IMovableRegistry.java
	src/api/java/appeng/api/movable/IMovableTile.java
	src/api/java/appeng/api/networkevents/MENetworkEvent.java
	src/api/java/appeng/api/networkevents/MENetworkEventSubscribe.java
	src/api/java/appeng/api/networkevents/MENetworkPowerStorage.java
	src/api/java/appeng/api/networkevents/MENetworkStorageEvent.java
	src/api/java/atomicscience/api/IAntiPoisonArmor.java
	src/api/java/atomicscience/api/IAntiPoisonBlock.java
	src/api/java/atomicscience/api/IElectromagnet.java
	src/api/java/atomicscience/api/IFissileMaterial.java
	src/api/java/atomicscience/api/IReactor.java
	src/api/java/atomicscience/api/ITemperature.java
	src/api/java/atomicscience/api/PlasmaEvent.java
	src/api/java/atomicscience/api/QuantumAssemblerRecipes.java
	src/api/java/buildcraft/api/blueprints/BlueprintManager.java
	src/api/java/buildcraft/api/core/IIconProvider.java
	src/api/java/buildcraft/api/core/SafeTimeTracker.java
	src/api/java/buildcraft/api/filler/FillerManager.java
	src/api/java/buildcraft/api/gates/IAction.java
	src/api/java/buildcraft/api/gates/package-info.java
	src/api/java/buildcraft/api/inventory/ISecuredInventory.java
	src/api/java/buildcraft/api/inventory/ISelectiveInventory.java
	src/api/java/buildcraft/api/power/package-info.java
	src/api/java/buildcraft/api/recipes/AssemblyRecipe.java
	src/api/java/buildcraft/api/recipes/RefineryRecipes.java
	src/api/java/buildcraft/api/recipes/package-info.java
	src/api/java/buildcraft/api/transport/FacadeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/api/java/buildcraft/api/transport/ISolidSideTile.java
	src/api/java/buildcraft/api/transport/package-info.java
	src/api/java/buildcraft/core/IMachine.java
	src/api/java/cofh/api/block/IBlockDebug.java
	src/api/java/cofh/api/block/IBlockInfo.java
	src/api/java/cofh/api/block/IDismantleable.java
	src/api/java/cofh/api/core/IInitializer.java
	src/api/java/cofh/api/core/ISimpleRegistry.java
	src/api/java/cofh/api/core/NullSimpleRegistry.java
	src/api/java/cofh/api/core/RegistryAccess.java
	src/api/java/cofh/api/energy/EnergyStorage.java
	src/api/java/cofh/api/energy/IEnergyContainerItem.java
	src/api/java/cofh/api/energy/IEnergyHandler.java
	src/api/java/cofh/api/energy/IEnergyStorage.java
	src/api/java/cofh/api/energy/ItemEnergyContainer.java
	src/api/java/cofh/api/energy/TileEnergyHandler.java
	src/api/java/cofh/api/tileentity/IEnergyInfo.java
	src/api/java/cofh/api/tileentity/IReconfigurableFacing.java
	src/api/java/cofh/api/tileentity/IReconfigurableSides.java
	src/api/java/cofh/api/tileentity/IRedstoneControl.java
	src/api/java/cofh/api/tileentity/ISecureTile.java
	src/api/java/cofh/api/tileentity/ISidedBlockTexture.java
	src/api/java/cofh/api/transport/IEnderAttuned.java
	src/api/java/cofh/api/transport/IItemConduit.java
	src/api/java/cofh/api/world/IFeatureGenerator.java
	src/api/java/cofh/api/world/IFeatureHandler.java
	src/api/java/cofh/api/world/WeightedRandomBlock.java
	src/api/java/forestry/api/apiculture/BeeManager.java
	src/api/java/forestry/api/apiculture/EnumBeeChromosome.java
	src/api/java/forestry/api/apiculture/EnumBeeType.java
	src/api/java/forestry/api/apiculture/FlowerManager.java
	src/api/java/forestry/api/apiculture/IAlleleBeeEffect.java
	src/api/java/forestry/api/apiculture/IAlleleBeeSpecies.java
	src/api/java/forestry/api/apiculture/IAlvearyComponent.java
	src/api/java/forestry/api/apiculture/IApiaristTracker.java
	src/api/java/forestry/api/apiculture/IArmorApiarist.java
	src/api/java/forestry/api/apiculture/IBee.java
	src/api/java/forestry/api/apiculture/IBeeGenome.java
	src/api/java/forestry/api/apiculture/IBeeHousing.java
	src/api/java/forestry/api/apiculture/IBeeListener.java
	src/api/java/forestry/api/apiculture/IBeeModifier.java
	src/api/java/forestry/api/apiculture/IBeeMutation.java
	src/api/java/forestry/api/apiculture/IBeeRoot.java
	src/api/java/forestry/api/apiculture/IBeekeepingLogic.java
	src/api/java/forestry/api/apiculture/IBeekeepingMode.java
	src/api/java/forestry/api/apiculture/IHiveDrop.java
	src/api/java/forestry/api/apiculture/IHiveFrame.java
	src/api/java/forestry/api/apiculture/package-info.java
	src/api/java/forestry/api/arboriculture/EnumGermlingType.java
	src/api/java/forestry/api/arboriculture/EnumGrowthConditions.java
	src/api/java/forestry/api/arboriculture/EnumTreeChromosome.java
	src/api/java/forestry/api/arboriculture/IAlleleFruit.java
	src/api/java/forestry/api/arboriculture/IAlleleGrowth.java
	src/api/java/forestry/api/arboriculture/IAlleleLeafEffect.java
	src/api/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
	src/api/java/forestry/api/arboriculture/IArboristTracker.java
	src/api/java/forestry/api/arboriculture/IFruitProvider.java
	src/api/java/forestry/api/arboriculture/IGrowthProvider.java
	src/api/java/forestry/api/arboriculture/ILeafTickHandler.java
	src/api/java/forestry/api/arboriculture/IToolGrafter.java
	src/api/java/forestry/api/arboriculture/ITree.java
	src/api/java/forestry/api/arboriculture/ITreeGenome.java
	src/api/java/forestry/api/arboriculture/ITreeModifier.java
	src/api/java/forestry/api/arboriculture/ITreeMutation.java
	src/api/java/forestry/api/arboriculture/ITreeRoot.java
	src/api/java/forestry/api/arboriculture/ITreekeepingMode.java
	src/api/java/forestry/api/arboriculture/TreeManager.java
	src/api/java/forestry/api/arboriculture/package-info.java
	src/api/java/forestry/api/circuits/ChipsetManager.java
	src/api/java/forestry/api/circuits/ICircuit.java
	src/api/java/forestry/api/circuits/ICircuitBoard.java
	src/api/java/forestry/api/circuits/ICircuitLayout.java
	src/api/java/forestry/api/circuits/ICircuitLibrary.java
	src/api/java/forestry/api/circuits/ICircuitRegistry.java
	src/api/java/forestry/api/circuits/ISolderManager.java
	src/api/java/forestry/api/circuits/package-info.java
	src/api/java/forestry/api/core/BlockInterface.java
	src/api/java/forestry/api/core/EnumHumidity.java
	src/api/java/forestry/api/core/EnumTemperature.java
	src/api/java/forestry/api/core/ForestryAPI.java
	src/api/java/forestry/api/core/ForestryEvent.java
	src/api/java/forestry/api/core/GlobalManager.java
	src/api/java/forestry/api/core/IArmorNaturalist.java
	src/api/java/forestry/api/core/IForestryConstants.java
	src/api/java/forestry/api/core/IGameMode.java
	src/api/java/forestry/api/core/IIconProvider.java
	src/api/java/forestry/api/core/INBTTagable.java
	src/api/java/forestry/api/core/IPlugin.java
	src/api/java/forestry/api/core/IStructureLogic.java
	src/api/java/forestry/api/core/ITextureManager.java
	src/api/java/forestry/api/core/ITileStructure.java
	src/api/java/forestry/api/core/IToolScoop.java
	src/api/java/forestry/api/core/ItemInterface.java
	src/api/java/forestry/api/core/PluginInfo.java
	src/api/java/forestry/api/core/Tabs.java
	src/api/java/forestry/api/core/package-info.java
	src/api/java/forestry/api/farming/Farmables.java
	src/api/java/forestry/api/farming/ICrop.java
	src/api/java/forestry/api/farming/IFarmComponent.java
	src/api/java/forestry/api/farming/IFarmHousing.java
	src/api/java/forestry/api/farming/IFarmInterface.java
	src/api/java/forestry/api/farming/IFarmListener.java
	src/api/java/forestry/api/farming/IFarmLogic.java
	src/api/java/forestry/api/farming/IFarmable.java
	src/api/java/forestry/api/farming/package-info.java
	src/api/java/forestry/api/food/BeverageManager.java
	src/api/java/forestry/api/food/IBeverageEffect.java
	src/api/java/forestry/api/food/IInfuserManager.java
	src/api/java/forestry/api/food/IIngredientManager.java
	src/api/java/forestry/api/food/package-info.java
	src/api/java/forestry/api/fuels/EngineBronzeFuel.java
	src/api/java/forestry/api/fuels/EngineCopperFuel.java
	src/api/java/forestry/api/fuels/FermenterFuel.java
	src/api/java/forestry/api/fuels/FuelManager.java
	src/api/java/forestry/api/fuels/GeneratorFuel.java
	src/api/java/forestry/api/fuels/MoistenerFuel.java
	src/api/java/forestry/api/fuels/RainSubstrate.java
	src/api/java/forestry/api/fuels/package-info.java
	src/api/java/forestry/api/genetics/AlleleManager.java
	src/api/java/forestry/api/genetics/EnumTolerance.java
	src/api/java/forestry/api/genetics/IAllele.java
	src/api/java/forestry/api/genetics/IAlleleArea.java
	src/api/java/forestry/api/genetics/IAlleleBoolean.java
	src/api/java/forestry/api/genetics/IAlleleEffect.java
	src/api/java/forestry/api/genetics/IAlleleFloat.java
	src/api/java/forestry/api/genetics/IAlleleFlowers.java
	src/api/java/forestry/api/genetics/IAlleleHandler.java
	src/api/java/forestry/api/genetics/IAlleleInteger.java
	src/api/java/forestry/api/genetics/IAllelePlantType.java
	src/api/java/forestry/api/genetics/IAlleleRegistry.java
	src/api/java/forestry/api/genetics/IAlleleSpecies.java
	src/api/java/forestry/api/genetics/IAlleleTolerance.java
	src/api/java/forestry/api/genetics/IBreedingTracker.java
	src/api/java/forestry/api/genetics/IChromosome.java
	src/api/java/forestry/api/genetics/IChromosomeType.java
	src/api/java/forestry/api/genetics/IClassification.java
	src/api/java/forestry/api/genetics/IEffectData.java
	src/api/java/forestry/api/genetics/IFlowerProvider.java
	src/api/java/forestry/api/genetics/IFruitBearer.java
	src/api/java/forestry/api/genetics/IFruitFamily.java
	src/api/java/forestry/api/genetics/IGenome.java
	src/api/java/forestry/api/genetics/IHousing.java
	src/api/java/forestry/api/genetics/IIndividual.java
	src/api/java/forestry/api/genetics/IIndividualLiving.java
	src/api/java/forestry/api/genetics/ILegacyHandler.java
	src/api/java/forestry/api/genetics/IMutation.java
	src/api/java/forestry/api/genetics/IPollinatable.java
	src/api/java/forestry/api/genetics/ISpeciesRoot.java
	src/api/java/forestry/api/genetics/package-info.java
	src/api/java/forestry/api/lepidopterology/EnumButterflyChromosome.java
	src/api/java/forestry/api/lepidopterology/EnumFlutterType.java
	src/api/java/forestry/api/lepidopterology/IAlleleButterflyEffect.java
	src/api/java/forestry/api/lepidopterology/IAlleleButterflySpecies.java
	src/api/java/forestry/api/lepidopterology/IButterfly.java
	src/api/java/forestry/api/lepidopterology/IButterflyGenome.java
	src/api/java/forestry/api/lepidopterology/IButterflyMutation.java
	src/api/java/forestry/api/lepidopterology/IButterflyNursery.java
	src/api/java/forestry/api/lepidopterology/IButterflyRoot.java
	src/api/java/forestry/api/lepidopterology/IEntityButterfly.java
	src/api/java/forestry/api/lepidopterology/ILepidopteristTracker.java
	src/api/java/forestry/api/lepidopterology/package-info.java
	src/api/java/forestry/api/mail/EnumPostage.java
	src/api/java/forestry/api/mail/ILetter.java
	src/api/java/forestry/api/mail/ILetterHandler.java
	src/api/java/forestry/api/mail/IPostOffice.java
	src/api/java/forestry/api/mail/IPostRegistry.java
	src/api/java/forestry/api/mail/IPostalCarrier.java
	src/api/java/forestry/api/mail/IPostalState.java
	src/api/java/forestry/api/mail/IStamps.java
	src/api/java/forestry/api/mail/ITradeStation.java
	src/api/java/forestry/api/mail/MailAddress.java
	src/api/java/forestry/api/mail/PostManager.java
	src/api/java/forestry/api/mail/TradeStationInfo.java
	src/api/java/forestry/api/mail/package-info.java
	src/api/java/forestry/api/package-info.java
	src/api/java/forestry/api/recipes/IBottlerManager.java
	src/api/java/forestry/api/recipes/ICarpenterManager.java
	src/api/java/forestry/api/recipes/ICentrifugeManager.java
	src/api/java/forestry/api/recipes/ICraftingProvider.java
	src/api/java/forestry/api/recipes/IFabricatorManager.java
	src/api/java/forestry/api/recipes/IFermenterManager.java
	src/api/java/forestry/api/recipes/IGenericCrate.java
	src/api/java/forestry/api/recipes/IMoistenerManager.java
	src/api/java/forestry/api/recipes/ISqueezerManager.java
	src/api/java/forestry/api/recipes/IStillManager.java
	src/api/java/forestry/api/recipes/IVariableFermentable.java
	src/api/java/forestry/api/recipes/RecipeManagers.java
	src/api/java/forestry/api/recipes/package-info.java
	src/api/java/forestry/api/storage/BackpackEvent.java
	src/api/java/forestry/api/storage/BackpackManager.java
	src/api/java/forestry/api/storage/BackpackResupplyEvent.java
	src/api/java/forestry/api/storage/BackpackStowEvent.java
	src/api/java/forestry/api/storage/EnumBackpackType.java
	src/api/java/forestry/api/storage/IBackpackDefinition.java
	src/api/java/forestry/api/storage/IBackpackInterface.java
	src/api/java/forestry/api/storage/package-info.java
	src/api/java/forestry/api/world/ITreeGenData.java
	src/api/java/forestry/api/world/IWorldGenInterface.java
	src/api/java/forestry/api/world/WorldGenManager.java
	src/api/java/forestry/api/world/package-info.java
	src/api/java/ic2/api/item/IC2Items.java
	src/api/java/ic2/api/item/Items.java
	src/api/java/mods/railcraft/api/carts/CartTools.java
	src/api/java/mods/railcraft/api/carts/IAlternateCartTexture.java
	src/api/java/mods/railcraft/api/carts/ICartContentsTextureProvider.java
	src/api/java/mods/railcraft/api/carts/IEnergyTransfer.java
	src/api/java/mods/railcraft/api/carts/IExplosiveCart.java
	src/api/java/mods/railcraft/api/carts/IItemTransfer.java
	src/api/java/mods/railcraft/api/carts/ILinkableCart.java
	src/api/java/mods/railcraft/api/carts/ILinkageManager.java
	src/api/java/mods/railcraft/api/carts/ILiquidTransfer.java
	src/api/java/mods/railcraft/api/carts/IMinecart.java
	src/api/java/mods/railcraft/api/carts/IPaintedCart.java
	src/api/java/mods/railcraft/api/carts/IRefuelableCart.java
	src/api/java/mods/railcraft/api/carts/IRoutableCart.java
	src/api/java/mods/railcraft/api/carts/bore/IBoreHead.java
	src/api/java/mods/railcraft/api/carts/bore/IMineable.java
	src/api/java/mods/railcraft/api/core/INetworkedObject.java
	src/api/java/mods/railcraft/api/core/IOwnable.java
	src/api/java/mods/railcraft/api/core/IPostConnection.java
	src/api/java/mods/railcraft/api/core/ITextureLoader.java
	src/api/java/mods/railcraft/api/core/WorldCoordinate.java
	src/api/java/mods/railcraft/api/core/items/IMinecartItem.java
	src/api/java/mods/railcraft/api/core/items/IStackFilter.java
	src/api/java/mods/railcraft/api/core/items/IToolCrowbar.java
	src/api/java/mods/railcraft/api/core/items/ITrackItem.java
	src/api/java/mods/railcraft/api/core/items/TagList.java
	src/api/java/mods/railcraft/api/crafting/IBlastFurnaceCraftingManager.java
	src/api/java/mods/railcraft/api/crafting/IBlastFurnaceRecipe.java
	src/api/java/mods/railcraft/api/crafting/ICokeOvenCraftingManager.java
	src/api/java/mods/railcraft/api/crafting/ICokeOvenRecipe.java
	src/api/java/mods/railcraft/api/crafting/IRockCrusherCraftingManager.java
	src/api/java/mods/railcraft/api/crafting/IRockCrusherRecipe.java
	src/api/java/mods/railcraft/api/crafting/IRollingMachineCraftingManager.java
	src/api/java/mods/railcraft/api/crafting/RailcraftCraftingManager.java
	src/api/java/mods/railcraft/api/events/CartLockdownEvent.java
	src/api/java/mods/railcraft/api/fuel/FuelManager.java
	src/api/java/mods/railcraft/api/helpers/Helpers.java
	src/api/java/mods/railcraft/api/helpers/StructureHelper.java
	src/api/java/mods/railcraft/api/signals/AbstractPair.java
	src/api/java/mods/railcraft/api/signals/DualSignalReceiver.java
	src/api/java/mods/railcraft/api/signals/IControllerTile.java
	src/api/java/mods/railcraft/api/signals/IPairEffectRenderer.java
	src/api/java/mods/railcraft/api/signals/IReceiverTile.java
	src/api/java/mods/railcraft/api/signals/ISignalPacketBuilder.java
	src/api/java/mods/railcraft/api/signals/SignalAspect.java
	src/api/java/mods/railcraft/api/signals/SignalController.java
	src/api/java/mods/railcraft/api/signals/SignalReceiver.java
	src/api/java/mods/railcraft/api/signals/SignalTools.java
	src/api/java/mods/railcraft/api/signals/SimpleSignalController.java
	src/api/java/mods/railcraft/api/signals/SimpleSignalReceiver.java
	src/api/java/mods/railcraft/api/tracks/IRoutingTrack.java
	src/api/java/mods/railcraft/api/tracks/ITrackBlocksMovement.java
	src/api/java/mods/railcraft/api/tracks/ITrackCustomPlaced.java
	src/api/java/mods/railcraft/api/tracks/ITrackCustomShape.java
	src/api/java/mods/railcraft/api/tracks/ITrackEmitter.java
	src/api/java/mods/railcraft/api/tracks/ITrackInstance.java
	src/api/java/mods/railcraft/api/tracks/ITrackItemIconProvider.java
	src/api/java/mods/railcraft/api/tracks/ITrackLockdown.java
	src/api/java/mods/railcraft/api/tracks/ITrackPowered.java
	src/api/java/mods/railcraft/api/tracks/ITrackReversable.java
	src/api/java/mods/railcraft/api/tracks/ITrackSwitch.java
	src/api/java/mods/railcraft/api/tracks/ITrackTile.java
	src/api/java/mods/railcraft/api/tracks/RailTools.java
	src/api/java/mods/railcraft/api/tracks/TrackInstanceBase.java
	src/api/java/mods/railcraft/api/tracks/TrackRegistry.java
	src/api/java/mods/railcraft/api/tracks/TrackSpec.java
	src/main/java/li/cil/occ/mods/appeng/DriverCellProvider.java
	src/main/java/li/cil/occ/mods/appeng/DriverTileController.java
	src/main/java/li/cil/occ/mods/appeng/ModAppEng.java
	src/main/java/li/cil/occ/mods/atomicscience/ModAtomicScience.java
	src/main/java/li/cil/occ/mods/computercraft/ModComputerCraft.java
	src/main/java/li/cil/occ/mods/enderstorage/ModEnderStorage.java
	src/main/java/li/cil/occ/mods/railcraft/DriverSteamTurbine.java
	src/main/java/li/cil/occ/mods/railcraft/ModRailcraft.java
	src/main/java/li/cil/occ/mods/redstoneinmotion/ModRedstoneInMotion.java
	src/main/java/li/cil/occ/mods/thermalexpansion/ModThermalExpansion.java
	src/main/java/li/cil/occ/mods/vanilla/DriverFluidHandler.java
	src/main/java/li/cil/occ/mods/vanilla/ModVanilla.java
	src/main/optional/ic2/api/item/Items.java
updated/stripped apis, it builds
added 'dependants' entry to mcmod.info, should avoid a certain crash; adjusted authors->authorList key name
Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7

Conflicts:
	build.properties
	gradle/forge.gradle
	src/api/java/dan200/computercraft/api/filesystem/IMount.java
	src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java
	src/api/java/dan200/computercraft/api/lua/ILuaContext.java
	src/api/java/dan200/computercraft/api/lua/ILuaObject.java
	src/api/java/dan200/computercraft/api/media/IMedia.java
	src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java
	src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java
	src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
	src/api/java/dan200/computercraft/api/turtle/TurtleSide.java
	src/api/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java
	src/api/java/dan200/computercraft/api/turtle/TurtleVerb.java
	src/main/java/li/cil/occ/OpenComponents.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral.java
Readded Applied Energistics addon with new Applied Energistics 2 api.
Added AppEng2 addon to main class
Merge pull request #7 from boomshroom/MC1.7

Re-added Applied Energistics addon
Cleanup, mostly formatting and tabs -> spaces.
Removed part of the AE2 API that made it fail to compile because of a missing class...
Bumped version number.
Fixed accessibility of CellContainer driver.
Also convert CellInventoryHandler.
Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7

Conflicts:
	build.properties
	src/main/java/li/cil/occ/OpenComponents.java
	src/main/java/li/cil/occ/mods/appeng/ModAppEng.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral.java
	src/main/java/li/cil/occ/mods/computercraft/ModComputerCraft.java
	src/main/java/li/cil/occ/mods/enderstorage/ModEnderStorage.java
	src/main/java/li/cil/occ/mods/railcraft/ModRailcraft.java
	src/main/java/li/cil/occ/mods/redstoneinmotion/ModRedstoneInMotion.java
	src/main/java/li/cil/occ/mods/thermalexpansion/ModThermalExpansion.java
	src/main/java/li/cil/occ/mods/vanilla/DriverFluidHandler.java
Updated Thaumcraft API.
Fixes for MC1.7 and re-added peripheral driver (untested).
Switch to apache logger.
Updated OC dependency version.
Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7

Conflicts:
	build.properties
	src/main/java/li/cil/occ/OpenComponents.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral15.java
Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7

Conflicts:
	build.properties
Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7

Conflicts:
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral15.java
	src/main/java/li/cil/occ/mods/computercraft/DriverPeripheral16.java
	src/main/java/li/cil/occ/mods/computercraft/ModComputerCraft.java
Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7
Corrected link to Jenkins.