Commit graph

9 commits

Author SHA1 Message Date
AlgorithmX2
25a588f303 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java
2014-05-13 19:25:07 -05:00
AlgorithmX2
34048d45a2 Don't erase inventory when someone asks for the drops... 2014-05-11 13:30:36 -05:00
AlgorithmX2
2e103efab8 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	tile/misc/TileCellWorkbench.java
2014-04-06 18:20:20 -05:00
AlgorithmX2
1ae63261ed Workbench now drops the cell inside it if broken. 2014-04-06 18:14:28 -05:00
AlgorithmX2
13b3555d01 Added Copy Mode to the Cell Workbench. 2014-04-06 18:05:09 -05:00
AlgorithmX2
d50c7f6312 Ported to 1.7 2014-02-08 19:34:52 -06:00
AlgorithmX2
3a0f3ee792 Changed AE Tile Event Stuff. 2014-01-26 00:46:16 -06:00
AlgorithmX2
42424f80c8 Refactoring API stuff 2014-01-23 13:02:48 -06:00
AlgorithmX2
834e9c04c5 Err too much. 2014-01-20 10:41:37 -06:00