Commit Graph

5 Commits

Author SHA1 Message Date
AlgorithmX2 b8a8f2f202 Crafting is now possible ( not complete but possible ) 2014-06-19 01:28:45 -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 6a8fafa58d Working Towards Crafing CPU MultiBlock 2014-05-13 21:42:14 -05:00
AlgorithmX2 f031972fcd Started working on crafting infrastructure and C-Cpus 2014-05-08 23:10:12 -05:00