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

Conflicts:
	items/tools/powered/ToolMassCannon.java

2014-06-04 23:05:22 -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-06-04 00:07:57 -05:00

misc

Added Paint Balls.

2014-05-26 03:26:37 -05:00

parts

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

2014-06-04 00:07:57 -05:00

storage

Patterns can now be encoded.

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

tools

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

2014-06-04 23:05:22 -05:00

AEBaseItem.java

Ported to 1.7

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