AlgorithmX2 01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ...

Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java

2014-05-22 18:49:02 -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-22 18:49:02 -05:00

AEFeatureHandler.java

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -05:00

ColoredItemDefinition.java

Cables now work in Recipes.

2014-03-09 21:11:29 -05:00

DamagedItemDefinition.java

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -05:00

IAEFeature.java

Particle Settings

2014-01-29 20:47:55 -06:00

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

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -05:00

WrappedDamageItemDefinition.java

Added all the crafting cpu "blocks" - needs textures and renders.

2014-05-10 00:00:02 -05:00