Commit graph

7 commits

Author SHA1 Message Date
AlgorithmX2
f343ac36e8 Fix Assembler Crash, and You can no longer insert processing patterns into Assemblers. 2014-07-12 20:03:17 -05:00
AlgorithmX2
01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java
2014-05-22 18:49:02 -05:00
AlgorithmX2
cbe41337ed Added Clear and Partition Based on contents to Storage Bus. 2014-05-21 21:09:29 -05:00
AlgorithmX2
1db9283eed Swapped out Gui Sync with something a little more fancy. 2014-05-07 00:22:42 -05:00
AlgorithmX2
0f75db5e80 Pretty much all of security minus the gui.
and all the stuff I did that i forgot to comment.
2014-01-26 22:00:36 -06:00
AlgorithmX2
5a6cd05e20 Gui/Priority Tab/Storage work. 2014-01-26 00:44:50 -06:00
AlgorithmX2
2e8ffc4a09 Work on Storage Bus. 2014-01-24 10:35:58 -06:00