1541998281
Sync up rv0 branch fixes into rv1
2014-07-08 19:36:20 -05:00
b42c257afd
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into 1.7.10
2014-07-07 23:54:47 -05:00
2ea77d35bc
Delay Block Updates, and save the world!
2014-07-07 23:54:28 -05:00
f3344f28c0
Added Animation for MAssembler
2014-07-06 21:04:58 -05:00
e658c40381
Interface Crafting, and fixed crash with import bus gui.
2014-07-06 01:48:21 -05:00
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
844b4843c0
Crafting API Added
...
Fixed tons of issues with CPU multi block weirdness.
2014-07-02 23:48:18 -05:00
1d687f3084
Graceful saving/loading and breaking of CPUs.
2014-07-02 00:05:21 -05:00
9a2614540d
Implementing Crafting Upgrade.
2014-07-01 20:44:12 -05:00
96b5115538
IC2 Api Update.
2014-06-28 20:26:43 -05:00
e5e373ce10
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-28 17:34:03 -05:00
6718fae629
Initial 1.7.10 IC2 API Update.
2014-06-28 17:32:40 -05:00
c99964dad6
Finished Crafting CPU Gui.
2014-06-28 00:20:12 -05:00
20de41caca
Fix forcePlan Flag.
2014-06-27 00:45:10 -05:00
115c3e597a
API Sync, IBaseMonitor
2014-06-27 00:44:56 -05:00
d750a25fca
Back Port "Fix an issue where interfaces would not cause storage buses to re-check their status."
2014-06-26 21:54:42 -05:00
215c097506
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-25 23:02:22 -05:00
9b65cc210d
Update MFR Rednet API
2014-06-25 21:19:20 -05:00
fdf3272fe0
Added Molecular Assembler Render.
2014-06-23 22:55:16 -05:00
f41c5793fe
Fix an issue where interfaces would not cause storage buses to re-check their status.
2014-06-23 00:08:38 -05:00
d4619fd48e
Adjusted Timing for MAs
...
MAs now save when things change.
Fixed a sleeping issue with MAs
MAs now drop their upgrades properly.
2014-06-22 23:52:14 -05:00
d730fe17b1
Interfaces now drop there items properly.
2014-06-22 23:51:20 -05:00
ff9a10b926
Crafting is virtually working 100%
2014-06-22 02:00:38 -05:00
65e9e272c4
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-21 11:57:38 -05:00
dd9c85e43e
Prevent block updates while loading parts; Should fix http://openeye.openmods.info/crashes/baf3e72a51ad8a5b8680ec24a819bc86
2014-06-20 12:12:48 -05:00
6cbc5aa953
Recursive crafting works.
...
MA's can accept pushes.
Interfaces no alter pushing behavior depending on ICraftingMachine settings.
Fixed bug where crafting would record items that don't exist as available for the initial pull.
2014-06-20 02:12:39 -05:00
04797294bb
implemented validForPass on all inventory handlers; allowed crafting to skip second pass.
2014-06-20 02:10:02 -05:00
755e87f006
Fixed bug with accelerator detection.
2014-06-20 02:07:52 -05:00
b8a8f2f202
Crafting is now possible ( not complete but possible )
2014-06-19 01:28:45 -05:00
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
0a18f2d926
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-17 23:36:53 -05:00
6084ac4e80
Fix Failed Insert Loop in IO Port.
2014-06-17 16:45:26 -05:00
1632d2d72e
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
items/tools/powered/ToolMassCannon.java
2014-06-16 00:51:51 -05:00
730200ed8d
Multi-block clean up should be cleaner now.
2014-06-13 14:39:36 -05:00
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
8dcf25a652
Fixed a bug where RF and IC2 tunnels could vaporize them selves.
...
Fixed Bug: #0514 - An unknown error occurs frequently
2014-06-08 18:10:19 -05:00
87bd8f3c22
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-07 23:29:57 -05:00
14aba981b2
Tweaked Energy Flow Code for Network Acceptor, should be more what I'm looking for.
2014-06-07 19:23:31 -05:00
f6d7762725
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
items/tools/powered/ToolMassCannon.java
2014-06-04 23:05:22 -05:00
1ab7f7c110
Ditch AABBPool
2014-06-04 22:59:56 -05:00
883292a7b1
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-03 20:49:40 -05:00
885bdbf9d5
More intelligent funneling demand.
2014-06-03 20:33:04 -05:00
584782ec6e
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-06-02 01:44:48 -05:00
10939b6001
RF Now only inserts up to the overflow.
2014-06-02 01:33:16 -05:00
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
8183becfd4
Paint Balls.
2014-05-31 20:50:56 -05:00
b872ae66c3
Fixed http://ae2.ae-mod.info/Tracker/0475/
2014-05-29 11:41:29 -05:00
7b33635c47
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-25 11:07:18 -05:00
4cf6f4e5f9
Don't Show Energy Cell info if the NBT Came from the client.
2014-05-25 11:06:59 -05:00
bd7b154455
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-25 00:03:27 -05:00
AlgorithmX2