Aidan C. Brady 6cc7efc64b Merge branch 'master' into 1.8		2014-07-12 22:53:21 -04:00
..
BlockBasic.java	Tank-based fluid container interaction fixes. Can't figure out the data request issue.	2014-07-07 15:54:26 -04:00
BlockBounding.java	Under 1300 errors left now, started on packet/network stuffs.	2014-04-20 21:15:44 +01:00
BlockCardboardBox.java	Fixed Combiner NEI texture, fixed Cardboard Box not working	2014-07-12 22:52:13 -04:00
BlockEnergyCube.java	Got some IC2 stuff working now. Turns out I was being stupid.	2014-06-26 18:18:18 +01:00
BlockGasTank.java	Got some IC2 stuff working now. Turns out I was being stupid.	2014-06-26 18:18:18 +01:00
BlockMachine.java	More work on Fusion Reactor and Lasers	2014-07-13 02:46:47 +01:00
BlockObsidianTNT.java	Sound system work	2014-06-02 23:57:40 +02:00
BlockOre.java	Under 1300 errors left now, started on packet/network stuffs.	2014-04-20 21:15:44 +01:00
BlockPlastic.java	Sound system work	2014-06-02 23:57:40 +02:00
BlockPlasticFence.java	Sound system work	2014-06-02 23:57:40 +02:00
BlockSalt.java	Added Salt Blocks - generates similarly to clay. Added tooltips for config GUI. Added option to regenerate ores, as this is now a thing. Also...began implementing different tiers of control circuits.	2014-07-09 22:06:36 -04:00