Commit graph

6 commits

Author SHA1 Message Date
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
AlgorithmX2
ff12aa1673 Added Shit+Mouse wheel to pick up / drop items.
Added Partial ItemStack packets to report to the server what itemstack is the target of interation.
Fixed Repairing Items in CraftingTerminal.
2014-05-12 23:11:19 -05:00
AlgorithmX2
4ee886c6ac Added Pattern Terminal Crafting. 2014-04-16 23:38:43 -05:00
AlgorithmX2
e20f26fc6d Partial progress on pattern slot. 2014-04-10 22:43:18 -05:00
AlgorithmX2
67cfc0a593 Crafting Terminal Sync Fix. 2014-02-10 23:49:40 -06:00
AlgorithmX2
e79e866417 Adjusted Terminal Packet Limits.
Fixed random errors thrown when FMP is installed.
Finished Crafting Terminal Basic Features.
2014-02-05 01:25:44 -06:00