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
..
contents	Fixed a bug with shift clicking.	2014-03-06 21:02:15 -06:00
materials	Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1	2014-05-03 14:12:19 -05:00
misc	Added Basic Restrictions on slots in MAC.	2014-04-24 20:55:29 -05:00
parts	Added P2P RF Tunnel.	2014-05-02 00:00:14 -05:00
storage	Patterns can now be encoded.	2014-04-17 01:15:56 -05:00
tools	Network tool can now lock Storage/Conversion Monitors.	2014-05-03 02:51:56 -05:00
AEBaseItem.java	Ported to 1.7	2014-02-08 19:34:52 -06:00