AlgorithmX2 3351af3d4e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ... Conflicts: items/materials/MaterialType.java util/Platform.java		2014-05-06 20:45:38 -05:00
..
registries	Added GrinderLogging and hid Grinder Logging behind it.	2014-05-06 14:56:06 -05:00
AEFeature.java	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-05-06 20:45:38 -05:00
AEFeatureHandler.java	Remove Meta values from Config.	2014-05-06 00:16:29 -05:00
ColoredItemDefinition.java	Cables now work in Recipes.	2014-03-09 21:11:29 -05:00
DamagedItemDefinition.java	Fixed an issue where Parts/Blocks would not properly identify them selves with the proper ItemStack.	2014-02-09 01:55:44 -06:00
IAEFeature.java
ItemStackSrc.java	Fixed an issue where Parts/Blocks would not properly identify them selves with the proper ItemStack.	2014-02-09 01:55:44 -06:00
NullItemDefinition.java