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

Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java

2014-05-13 19:25:07 -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-13 19:25:07 -05:00

AppEngPacket.java

Upped another 30k packet limit to 2mb

2014-05-11 17:02:53 -05:00

AppEngPacketHandlerBase.java

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

2014-05-13 19:25:07 -05:00

GuiBridge.java

Started Work in MAC Gui.

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