Mekanism-tilera-Edition/common/mekanism/common
Aidan Brady 1953e16b5a Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Conflicts:
	common/mekanism/common/TileEntityUniversalCable.java
2013-07-31 11:59:49 -04:00
..
network Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
BlockBasic.java Re-commit Dynamic Tank fix 2013-07-20 12:17:58 -04:00
BlockBounding.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
BlockEnergyCube.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
BlockGasTank.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
BlockMachine.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
BlockObsidianTNT.java General cleanup 2013-06-28 19:43:45 -04:00
BlockOre.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
BlockTransmitter.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
CableUtils.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ChargeUtils.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
CommandMekanism.java Make it so that /mk is always available in SSP 2013-07-29 21:38:10 +01:00
CommonPlayerTickHandler.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
CommonProxy.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
CommonWorldTickHandler.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
ContainerAdvancedElectricMachine.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerDynamicTank.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerElectricChest.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerElectricMachine.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerElectricPump.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerEnergyCube.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerFactory.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerGasTank.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
ContainerMetallurgicInfuser.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ContainerRobitCrafting.java General cleanup 2013-06-28 19:43:45 -04:00
ContainerRobitInventory.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
ContainerRobitMain.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
ContainerRobitRepair.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ContainerRobitSmelting.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
ContainerTeleporter.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
CoreGuiHandler.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
CreativeTabMekanism.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
DynamicFluidTank.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
DynamicTankCache.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
EnergyNetwork.java Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-31 11:59:49 -04:00
EnergyNetworkRegistry.java Fix the EnergyNetwork memory leak. 2013-07-29 21:30:43 +01:00
EntityObsidianTNT.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
EntityRobit.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
FluidNetwork.java Fixed StackOverflowException with MFR, fixed incorrect UE charging values 2013-07-27 19:32:46 -04:00
FluidSlot.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
IActiveState.java Less client-based lag on machines and generators 2013-07-07 12:13:52 -04:00
IBoundingBlock.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
IC2EnergyHandler.java Fixed IC2 integration, minor cleanup 2013-07-02 13:25:56 -04:00
IElectricChest.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
IElectricMachine.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
IEnergyCube.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
IFactory.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
IMechanicalPipe.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
IModule.java Removed "upgrade dump" configurator mode, upgrades can now be removed in GUIs 2013-07-06 21:33:08 -04:00
InventoryElectricChest.java General cleanup 2013-06-28 19:43:45 -04:00
ISpecialBounds.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ISustainedInventory.java General cleanup 2013-06-28 19:43:45 -04:00
ISustainedTank.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
ItemAtomicDisassembler.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ItemBlockBasic.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemBlockEnergyCube.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
ItemBlockMachine.java Fixed StackOverflowException with MFR, fixed incorrect UE charging values 2013-07-27 19:32:46 -04:00
ItemBlockOre.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemBlockTransmitter.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
ItemClump.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemConfigurator.java Add ability to manually force-fix a network using a configurator 2013-07-29 22:48:12 +01:00
ItemDirtyDust.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemDust.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemElectricBow.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ItemEnergized.java Fixed StackOverflowException with MFR, fixed incorrect UE charging values 2013-07-27 19:32:46 -04:00
ItemEnergyMeter.java Add debug info to EnergyMeter 2013-07-29 22:52:31 +01:00
ItemIngot.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemMachineUpgrade.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemMekanism.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ItemPortableTeleporter.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ItemRobit.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
ItemStopwatch.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
ItemStorageTank.java General cleanup 2013-06-28 19:43:45 -04:00
ItemWeatherOrb.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
ITileNetwork.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
IUniversalCable.java Fix the EnergyNetwork memory leak. 2013-07-29 21:30:43 +01:00
LiquidSlot.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
Mekanism.java Clean up a bit of unnecessary logic 2013-07-29 21:06:01 +01:00
MekanismHooks.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
MekanismRecipe.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
MekanismUtils.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
OreHandler.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
PacketHandler.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
PipeUtils.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
RecipeHandler.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
RobitAIFollow.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
SlotElectricChest.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
SlotEnergy.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
SlotMachineUpgrade.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
SlotOutput.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
SlotStorageTank.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
SynchronizedTankData.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TankUpdateProtocol.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
Teleporter.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
ThreadGetData.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
Tier.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
TileEntityAdvancedElectricMachine.java Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-26 18:16:28 -04:00
TileEntityAdvancedFactory.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityBasicBlock.java Re-enabled face culling, re-fixed getPickBlock() 2013-07-08 18:52:03 -04:00
TileEntityBasicMachine.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
TileEntityBoundingBlock.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
TileEntityChargepad.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
TileEntityCombiner.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityContainerBlock.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityControlPanel.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
TileEntityCrusher.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityDynamicTank.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityDynamicValve.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityElectricBlock.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
TileEntityElectricChest.java Fix ArrayIndexOutOfBoundsException in Electric Chest when attached to AE import buses and presumably other things. 2013-07-29 21:02:36 +01:00
TileEntityElectricMachine.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
TileEntityElectricPump.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
TileEntityEliteFactory.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityEnergizedSmelter.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityEnergyCube.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
TileEntityEnrichmentChamber.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityFactory.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
TileEntityGasTank.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityMechanicalPipe.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityMetallurgicInfuser.java Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken. 2013-07-31 11:54:58 -04:00
TileEntityOsmiumCompressor.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityPressurizedTube.java Rebase for new workspace (sorry) 2013-06-28 18:01:00 -04:00
TileEntityPurificationChamber.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityTeleporter.java Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
TileEntityTheoreticalElementizer.java First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00
TileEntityUniversalCable.java Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-31 11:59:49 -04:00
Version.java v5.5.6 Beta #24 2013-06-29 17:24:54 -04:00