Commit graph

138 commits

Author SHA1 Message Date
AlgorithmX2
0b50d23014 Added Feature: #0711 - Options to change font size in game. 2014-07-24 23:59:58 -05:00
AlgorithmX2
9223f724bf Added Feature: #0715 - Mekanism recipes
Added Feature: #0702 - Mekanism Power for Energy Acceptor
2014-07-24 22:20:52 -05:00
AlgorithmX2
980dff203f IntegrationType Re-factor. 2014-07-23 17:26:23 -05:00
AlgorithmX2
1747204928 Feature: #0675 - Drag'n'Drop functionality when making patterns
Fixed a bug where pattern would not properly re-populate the pattern terminal when they were re-inserted.
Shift clicking into the inscriber is more intelligent.
2014-07-19 14:33:28 -05:00
AlgorithmX2
8ae01a4e38 Added Interface Priority. 2014-07-17 22:38:57 -05:00
AlgorithmX2
e49864e295 Nameable CPUs. 2014-07-15 22:26:12 -05:00
AlgorithmX2
8c0658d3de Import Clean up. 2014-07-15 12:01:32 -05:00
AlgorithmX2
675d068934 Swapped Crafting / Processing Tab behavior, seems more natural. 2014-07-14 22:33:17 -05:00
AlgorithmX2
cc76e2329c Fix NEI Tooltips. 2014-07-14 22:30:32 -05:00
AlgorithmX2
423e6be0c8 Create a sort order for interfaces based on their location. 2014-07-12 20:20:21 -05:00
AlgorithmX2
4ab497aab1 Fixed Bug: #0605 - Molecular Assembler card slots 2014-07-12 15:30:00 -05:00
AlgorithmX2
131538349a Removed Ore Substitution button. 2014-07-11 15:06:09 -05:00
AlgorithmX2
7242dfeb08 Fixed Crafting CPU Render.
Finished Crafting Confirm Screen
Added logic to prevent crafting in cpus with too little storage.
2014-07-10 23:46:51 -05:00
AlgorithmX2
d2e332eedb Fixed NEI Ghost Overlays. 2014-07-09 22:18:50 -05:00
AlgorithmX2
16ef731c00 Interface Terminal
Fixed bug with Assembler Packet Crashing the server.
2014-07-09 03:17:11 -05:00
AlgorithmX2
813c1bcb58 Considerable progress on Interface terminal. 2014-07-07 22:48:21 -05:00
AlgorithmX2
6ce5a8f4c5 Improved NEI Integration and Pattern Terminal Support 2014-07-06 01:52:29 -05:00
AlgorithmX2
fa542c7d15 Add Upgrade Features to Interface, and add Buttons to Interface and Export Bus o alter crafting behavior. 2014-07-04 20:59:50 -05:00
AlgorithmX2
d958ac5c6b Fix bug where Crafting CPU Gui would leave scroll bar in the top left corner if it was empty. 2014-07-04 17:41:39 -05:00
AlgorithmX2
4ce40869f4 Fix issues with Pattern Terminal. 2014-07-01 20:43:08 -05:00
AlgorithmX2
36f81cf0b7 MORE Gui work for crafting 2014-06-29 04:06:07 -05:00
AlgorithmX2
c8bdf1bd45 Crafting Plan Screen is almost done. 2014-06-28 15:18:36 -05:00
AlgorithmX2
4a5e9f4d5b Clicking on crafting slots with an item in your hand no longer switches guis 2014-06-28 00:20:37 -05:00
AlgorithmX2
c99964dad6 Finished Crafting CPU Gui. 2014-06-28 00:20:12 -05:00
AlgorithmX2
ad0151d086 Handle Crafting CPU Gui Networking and background monitoring. 2014-06-27 00:45:29 -05:00
AlgorithmX2
2a8c028ab9 minor cpu gui work. 2014-06-26 21:47:26 -05:00
AlgorithmX2
4ab4b335c3 Started work on Crafting CPU Gui 2014-06-25 20:49:37 -05:00
AlgorithmX2
32ee57c3a9 Separated Crafting job into a worker thread.
Crafting calculation can be canceled.
Hooked up a crafting calculation launch and the confirmation GUI.
2014-06-18 01:23:37 -05:00
AlgorithmX2
92f728be67 Crafting Calculator mostly works now - is missing features however. 2014-06-16 00:48:43 -05:00
AlgorithmX2
652d2e6018 Also Cables no longer glow in the dark :P
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	core/localization/GuiText.java
2014-06-08 21:13:53 -05:00
AlgorithmX2
3d8a129531 Fixed Bug: #0518 - Using the WAT and switch via quickslots closes WAT GUI 2014-06-08 18:10:25 -05:00
AlgorithmX2
03330d02ba Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-06 21:10:26 -05:00
AlgorithmX2
a50505fed6 Fixed Bug: #0431 - Weird Inventory behaviour in SkyChests with InvTweaks 2014-06-06 21:04:59 -05:00
AlgorithmX2
fe74989563 Keep Search when switching between crafting and normal view. 2014-06-02 21:04:47 -05:00
AlgorithmX2
905832ae85 Renamed ExtraTextures and added ExtraItemTextures. 2014-05-25 20:58:44 -05:00
AlgorithmX2
fa376237fd remove unused variable, and added lumen cable. 2014-05-25 17:43:17 -05:00
AlgorithmX2
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
d5cfa12f76 Added Energy Cells Charge levels to Waila 2014-05-24 18:22:50 -05:00
AlgorithmX2
397dbe8d10 Added Next button.
Added text for Amount gui.
2014-05-24 16:16:22 -05:00
AlgorithmX2
832c4ecdb9 Only show crafting/stored/both where applicable. 2014-05-23 23:21:10 -05:00
AlgorithmX2
bc55956d56 Crafting Amount Gui Mostly Done, missing "Next Button" 2014-05-23 23:20:56 -05:00
AlgorithmX2
26dcae3f9b Send Crafting Gui Packet to open second gui. 2014-05-23 20:35:27 -05:00
AlgorithmX2
e2c3e18133 Added Crafting/Stored/Both setting to ItemRepo 2014-05-22 21:41:09 -05:00
AlgorithmX2
01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java
2014-05-22 18:49:02 -05:00
AlgorithmX2
cbe41337ed Added Clear and Partition Based on contents to Storage Bus. 2014-05-21 21:09:29 -05:00
AlgorithmX2
fa1feff8f0 Added View Button ( dosn't work ) 2014-05-19 23:13:25 -05:00
AlgorithmX2
68993534d9 Slowly working towards crafting.
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	client/gui/widgets/GuiImgButton.java
	core/localization/ButtonToolTips.java
2014-05-18 20:05:03 -05:00
AlgorithmX2
440ac95dc4 Change Tooltip for clear button in Crafting Terminal. 2014-05-18 14:53:18 -05:00
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