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

Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java

2014-05-03 14:12:19 -05:00

..

network

Renamed Inscriber Recipe Type to Inscribe.

2014-03-08 21:35:53 -06:00

packets

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

2014-05-03 14:12:19 -05:00

AppEngPacket.java

Throw Exception when generating a 30,000+ byte packet

2014-02-16 15:54:43 -06:00

AppEngPacketHandlerBase.java

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

2014-05-03 14:12:19 -05:00

GuiBridge.java

Started Work in MAC Gui.

2014-04-24 01:14:26 -05:00