Commit Graph

3 Commits

Author SHA1 Message Date
thatsIch ce2dbecde1 Typo SpecialComparsonRegistry 2014-09-21 02:27:54 +02:00
thatsIch f4b41e0fa1 Typo overrrides 2014-09-21 02:15:37 +02: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