Mekanism-tilera-Edition/src/main/java/mekanism/common/item
Aidan Brady 81d3d53d76 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/item/ItemConfigurator.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
2014-08-07 12:29:43 -04:00
..
ItemAtomicDisassembler.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
ItemBalloon.java Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency 2014-07-14 17:14:32 -04:00
ItemBlockBasic.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
ItemBlockCardboardBox.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
ItemBlockEnergyCube.java Fix energy cubes not coming from NEI charged 2014-08-03 20:27:20 +01:00
ItemBlockGasTank.java Upgraded gas item recipe integration greatly, should make things much smoother. 2014-07-09 17:05:33 -04:00
ItemBlockMachine.java Properly localise fluid names on machine blocks 2014-08-04 01:01:15 +01:00
ItemBlockOre.java More bits of work 2014-05-30 23:10:05 +02:00
ItemBlockPlastic.java Sound system work 2014-06-02 23:57:40 +02:00
ItemClump.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemConfigurator.java Merge branch 'development' into 1.8 2014-08-07 12:29:43 -04:00
ItemControlCircuit.java Fixed the addition of the "creative control circuit" 2014-07-31 21:08:46 -04:00
ItemCrystal.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemDictionary.java Greatly improved localization 2014-06-10 11:35:54 +02:00
ItemDirtyDust.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemDust.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemElectricBow.java Greatly improved localization 2014-06-10 11:35:54 +02:00
ItemEnergized.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
ItemFilterCard.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemFlamethrower.java Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
ItemFreeRunners.java Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
ItemGasMask.java Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
ItemHDPE.java Sound system work 2014-06-02 23:57:40 +02:00
ItemIngot.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemJetpack.java Make the mod classes significantly less godlike. 2014-08-01 01:35:06 +01:00
ItemMekanism.java Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things. 2014-04-20 04:34:19 +01:00
ItemNetworkReader.java Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures. 2014-07-09 15:31:57 -04:00
ItemPortableTeleporter.java Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency 2014-07-14 17:14:32 -04:00
ItemProxy.java A major load of fixes - things should be about back to normal now. 2014-06-03 19:54:45 +02:00
ItemRobit.java Greatly improved localization 2014-06-10 11:35:54 +02:00
ItemScubaTank.java Upgraded gas item recipe integration greatly, should make things much smoother. 2014-07-09 17:05:33 -04:00
ItemSeismicReader.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemShard.java Under 1300 errors left now, started on packet/network stuffs. 2014-04-20 21:15:44 +01:00
ItemUpgrade.java Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
ItemWalkieTalkie.java Greatly improved localization 2014-06-10 11:35:54 +02:00