tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
806 commits 7 branches 98 tags 24 MiB
Commit graph

201 commits

Author SHA1 Message Date
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
db8fa143ed Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-27 18:50:53 -05:00
AlgorithmX2
8ffc032f07 Fixed http://ae2.ae-mod.info/Tracker/0467/ 2014-06-27 13:48:48 -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
fdf3272fe0 Added Molecular Assembler Render. 2014-06-23 22:55:16 -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
734663f521 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-11 00:44:00 -05:00
AlgorithmX2
bbfa43dd92 Breaking and Damaging Particles for cables now work properly. 
Breaking Animation now works on Cables as expected.
Cable now has a bounding box where it touches parts.
 2014-06-11 00:14:37 -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
900a278ec2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	core/localization/GuiText.java
 2014-05-31 20:58:52 -05:00
AlgorithmX2
8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2
e17ac60141 Fixed Bug: #0470 - Incorrect search with russian capital letters 2014-05-29 11:51:07 -05:00
AlgorithmX2
161f88e42c Added Paint Balls. 
Added Color Applicator.
 2014-05-26 03:26:37 -05:00
AlgorithmX2
82ac1eb2e7 Add support for Mouse Wheel Event passing to Items. the clean way. 2014-05-26 03:25:17 -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
269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 22:17:52 -05:00
AlgorithmX2
dc0c015a97 Fix NPE. 2014-05-20 22:06:48 -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
b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2
cfeebae5ac First pass at trying to make a CPU render - is basically a multiblock heat vent at this point. 2014-05-15 09:34:38 -05:00
AlgorithmX2
322b0a7da7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-13 21:57:17 -05:00
AlgorithmX2
974a41eabb Solved the mystery of the broken lighting. 2014-05-13 21:56:57 -05:00
AlgorithmX2
6a8fafa58d Working Towards Crafing CPU MultiBlock 2014-05-13 21:42:14 -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
AlgorithmX2
d84ec9c0bf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-10 17:19:26 -05:00
AlgorithmX2
570f098f81 Fixed a few more rendering/visual update glitches. 2014-05-10 13:27:48 -05:00
AlgorithmX2
b0aedc1b01 MAC Now shows progress. 2014-05-08 23:09:42 -05:00