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

..

contents

Fixed a bug with shift clicking.

2014-03-06 21:02:15 -06:00

materials

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

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

misc

Added Basic Restrictions on slots in MAC.

2014-04-24 20:55:29 -05:00

parts

Remove Meta values from Config.

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

storage

Patterns can now be encoded.

2014-04-17 01:15:56 -05:00

tools

Network tool can now lock Storage/Conversion Monitors.

2014-05-03 02:51:56 -05:00

AEBaseItem.java

Ported to 1.7

2014-02-08 19:34:52 -06:00