AlgorithmX2 3c510b6925 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ...

Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java

2014-05-03 14:12:19 -05:00

..

registries

Less null Items

2014-05-02 01:03:02 -05:00

AEFeature.java

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

2014-05-03 14:12:19 -05:00

AEFeatureHandler.java

Renamed Inscriber Recipe Type to Inscribe.

2014-03-08 21:35:53 -06: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

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

Replace Non created materials/parts with null item definitions instead of null.

2014-01-28 14:20:19 -06:00