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

..

gui

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

2014-05-06 20:45:38 -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-06 20:45:38 -05:00

texture

Separated Textures for many parts.

2014-04-03 23:31:10 -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