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

Conflicts:
	items/tools/powered/ToolMassCannon.java

2014-06-16 00:51:51 -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

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

2014-06-11 00:44:00 -05:00

parts

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

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

storage

Cell Type Usage Fixed.

2014-06-12 09:37:08 -05:00

tools

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

2014-06-16 00:51:51 -05:00

AEBaseItem.java

Ported to 1.7

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