Mekanism-tilera-Edition/src/main/java/mekanism/common/item
Ben Spiers ede0015eec Merge branch 'development' into networkRefactor
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
2015-04-04 02:58:26 +01:00
..
ItemAtomicDisassembler.java Merge branch 'master' into development 2015-03-04 14:30:05 -05:00
ItemBalloon.java Cleanup, cleared some warnings. 2015-03-18 13:51:14 +01:00
ItemBlockBasic.java Configurable values for Mekanism tier-related properties 2015-04-01 11:06:27 -04:00
ItemBlockCardboardBox.java Cardboard Box no longer picks up blocks that have -1 hardness values, also prevented Electric Chests from being vulnerable to explosives when locked 2015-03-04 17:31:52 -05:00
ItemBlockEnergyCube.java Configurable values for Mekanism tier-related properties 2015-04-01 11:06:27 -04:00
ItemBlockGasTank.java Work on droppers! Easiest way to get rid of leftover fluids and gasses in machine gauges. 2015-02-26 19:30:19 -05:00
ItemBlockMachine.java Don't reset induction cell storage 2015-03-29 13:26:43 -04:00
ItemBlockOre.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemBlockPlastic.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemClump.java Fixed transition crashes 2015-03-22 16:13:06 -04:00
ItemConfigurator.java Add Optional removal of IToolHammer. Fixes #2216 2015-03-17 23:49:45 +00:00
ItemControlCircuit.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemCrystal.java Fixed transition crashes 2015-03-22 16:13:06 -04:00
ItemDictionary.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemDirtyDust.java Fixed transition crashes 2015-03-22 16:13:06 -04:00
ItemDust.java Fixed a transition crash 2015-03-21 11:11:24 -05:00
ItemElectricBow.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemEnergized.java Make the @Optional removals stricter. 2015-03-16 15:48:19 +00:00
ItemFactoryInstaller.java Factory Installers are done! 2015-03-05 08:24:00 -05:00
ItemFilterCard.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemFlamethrower.java Fixed some tooltips, Hohlraum now properly accepts D-T fuel, added Hohlraum recipe, added lithium to EIM recipes 2015-03-06 07:50:09 -05:00
ItemFreeRunners.java Make the @Optional removals stricter. 2015-03-16 15:48:19 +00:00
ItemGasMask.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemGaugeDropper.java Fixed some dropper bugs 2015-02-26 22:28:10 -05:00
ItemHDPE.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemIngot.java Refactored Dust items, removed Obsidian ore processing (doesn't have a use considering Obsidian is just about entirely renewable) 2015-03-17 19:16:36 -04:00
ItemJetpack.java Fixed some tooltips, Hohlraum now properly accepts D-T fuel, added Hohlraum recipe, added lithium to EIM recipes 2015-03-06 07:50:09 -05:00
ItemMekanism.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemNetworkReader.java Start on refactor of entire network system. 2015-04-01 02:42:36 +01:00
ItemOtherDust.java Refactored Dust items, removed Obsidian ore processing (doesn't have a use considering Obsidian is just about entirely renewable) 2015-03-17 19:16:36 -04:00
ItemPortableTeleporter.java Fixed a few crashes 2015-04-03 20:21:05 -04:00
ItemProxy.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemRobit.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemScubaTank.java Fixed Gas Masks not working 2015-03-22 21:53:00 -04:00
ItemSeismicReader.java Giant optimise imports. 2014-11-10 21:53:29 +00:00
ItemShard.java Fixed transition crashes 2015-03-22 16:13:06 -04:00
ItemUpgrade.java Re-organise imports. 2014-09-03 19:00:03 +01:00
ItemWalkieTalkie.java Giant optimise imports. 2014-11-10 21:53:29 +00:00