AlgorithmX2 900a278ec2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 ...

Conflicts:
	core/localization/GuiText.java

2014-05-31 20:58:52 -05:00

..

InternalSlotME.java

All Terminals now can be opened in low power / channel state and show dark slots.

2014-03-27 23:31:06 -05:00

ItemRepo.java

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-05-31 20:58:52 -05:00

SlotME.java

All Terminals now can be opened in low power / channel state and show dark slots.

2014-03-27 23:31:06 -05:00