AlgorithmX2 900a278ec2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ... Conflicts: core/localization/GuiText.java		2014-05-31 20:58:52 -05:00
..
automation	Annihilation Plane now drops its buffer.	2014-05-27 15:47:36 -05:00
layers	Changed Package Names.	2014-05-27 12:15:49 -05:00
misc	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-05-25 00:03:27 -05:00
networking	remove unused variable, and added lumen cable.	2014-05-25 17:43:17 -05:00
p2p	Add backwards support for MJ5 ( from MJ6 )	2014-05-20 22:06:37 -05:00
reporting	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-05-03 14:12:19 -05:00
AEBasePart.java	Added all the crafting cpu "blocks" - needs textures and renders.	2014-05-10 00:00:02 -05:00
BusCollisionHelper.java	Ported to 1.7	2014-02-08 19:34:52 -06:00
CableBusContainer.java	Changed "Invalid NBT For CableBus Container" to a warning instead of a exception.	2014-05-27 16:02:15 -05:00
ICableBusContainer.java	Fix Block Cable Painting Support.	2014-03-26 22:27:14 -05:00
NullCableBusContainer.java	Fix Block Cable Painting Support.	2014-03-26 22:27:14 -05:00
PartBasicState.java	Added Waila Integration.	2014-02-19 21:16:41 -06:00
PartPlacement.java	Added Paint Balls.	2014-05-26 03:26:37 -05:00