Commit graph

8 commits

Author SHA1 Message Date
AlgorithmX2
92f728be67 Crafting Calculator mostly works now - is missing features however. 2014-06-16 00:48:43 -05:00
AlgorithmX2
44986692ef Pattern progress. 2014-06-08 11:25:46 -05:00
AlgorithmX2
3b394face2 More work on crafting calculations. 2014-06-05 23:26:01 -05:00
AlgorithmX2
ef4cab8f61 Storage grid can now properly see crafting grid. 2014-05-22 21:42:27 -05:00
AlgorithmX2
24e76e5a88 Crafting Cache Registered and added events. 2014-05-19 23:13:12 -05:00
AlgorithmX2
68993534d9 Slowly working towards crafting.
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	client/gui/widgets/GuiImgButton.java
	core/localization/ButtonToolTips.java
2014-05-18 20:05:03 -05:00
AlgorithmX2
b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2
f031972fcd Started working on crafting infrastructure and C-Cpus 2014-05-08 23:10:12 -05:00