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

Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java

2014-05-13 19:25:07 -05:00

..

gui

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

2014-05-13 19:25:07 -05:00

me

Added NEI Sync.

2014-04-19 23:35:13 -05:00

render

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

2014-05-10 17:19:26 -05:00

texture

No more null icons!

2014-05-07 20:54:28 -05:00

ClientHelper.java

Move RenderManager interaction to Post Init ( fixes some kind of weird conflict with a key bind mod )

2014-04-19 20:41:43 -05:00

EffectType.java

Removed Block Definitions for MAC Parts.

2014-02-23 16:50:53 -06:00