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

..

ItemMultiMaterial.java

Remove Meta values from Config.

2014-05-06 00:16:29 -05:00

MaterialType.java

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

2014-05-06 20:45:38 -05:00