Mekanism-tilera-Edition/src/main/java/mekanism/common/tile
Ben Spiers b31aa92844 Update lots of APIs, most notably BC and an actual 1.7 version of CC
Conflicts:
	build.properties
	src/api/java/buildcraft/api/core/BlockIndex.java
	src/api/java/buildcraft/api/core/BuildCraftAPI.java
	src/api/java/buildcraft/api/fuels/IFuel.java
	src/api/java/buildcraft/api/mj/BatteryObject.java
	src/api/java/buildcraft/api/mj/IBatteryIOObject.java
	src/api/java/buildcraft/api/mj/IBatteryObject.java
	src/api/java/buildcraft/api/mj/IOMode.java
	src/api/java/buildcraft/api/mj/MjAPI.java
	src/api/java/buildcraft/api/mj/MjBattery.java
	src/api/java/buildcraft/api/power/PowerHandler.java
	src/api/java/buildcraft/api/recipes/CraftingResult.java
	src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
	src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
	src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FuelHandler.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/CableUtils.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/TransporterUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
2014-11-13 19:30:39 +00:00
..
component Cache all the things. 2014-09-06 21:14:49 +01:00
TileEntityAdvancedBoundingBlock.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityAdvancedElectricMachine.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityAdvancedFactory.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
TileEntityAmbientAccumulator.java Cleanup imports again. 2014-09-05 18:32:54 +01:00
TileEntityBasicBlock.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityBasicMachine.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityBin.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityBoundingBlock.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityCardboardBox.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityChanceMachine.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityChargepad.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityChemicalCrystallizer.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityChemicalDissolutionChamber.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityChemicalInfuser.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityChemicalInjectionChamber.java More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
TileEntityChemicalOxidizer.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityChemicalWasher.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityCombiner.java More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
TileEntityContainerBlock.java Cache all the things. 2014-09-06 21:14:49 +01:00
TileEntityCrusher.java More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
TileEntityDigitalMiner.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityDynamicTank.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityDynamicValve.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityElectricBlock.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityElectricChest.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityElectricMachine.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityElectricPump.java Merge branch 'development' into 1.8 2014-10-02 12:47:22 -04:00
TileEntityElectrolyticSeparator.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityEliteFactory.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
TileEntityEnergizedSmelter.java Fix factories and smelting. 2014-09-05 18:31:10 +01:00
TileEntityEnergyCube.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityEnrichmentChamber.java More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
TileEntityEntangledBlock.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityFactory.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityFluidicPlenisher.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityGasTank.java Cleanup 2014-09-27 14:44:13 -04:00
TileEntityLaser.java Make laser digging require constant illumination. 2014-09-16 02:47:54 +01:00
TileEntityLaserAmplifier.java Make laser digging require constant illumination. 2014-09-16 02:47:54 +01:00
TileEntityLaserTractorBeam.java Make laser digging require constant illumination. 2014-09-16 02:47:54 +01:00
TileEntityLogisticalSorter.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityMetallurgicInfuser.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityMultiblock.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityNoisyElectricBlock.java Fix factories and smelting. 2014-09-05 18:31:10 +01:00
TileEntityObsidianTNT.java Move the directory structure around to a more conventional one and start out on the 1.7 update. 2014-04-20 03:44:06 +01:00
TileEntityOsmiumCompressor.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityPortableTank.java Merge branch 'development' into 1.8 2014-10-26 15:28:28 -04:00
TileEntityPRC.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00
TileEntityPrecisionSawmill.java More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
TileEntityPurificationChamber.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntityRotaryCondensentrator.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntitySalinationBlock.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntitySalinationController.java Merge branch 'development' into 1.8 (hopefully I didn't miss anything) 2014-09-27 14:40:25 -04:00
TileEntitySalinationValve.java Re-organise imports. 2014-09-03 19:00:03 +01:00
TileEntitySeismicVibrator.java Add pulse mode to redstone control. 2014-09-16 02:47:54 +01:00
TileEntityTeleporter.java Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-13 19:30:39 +00:00