Commit graph

1149 commits

Author SHA1 Message Date
AlgorithmX2
a0bb77fa43 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into 1.7.10 2014-06-29 12:43:45 -05:00
AlgorithmX2
2c77242667 Disassemble Storages Cells regardless of where your looking. 2014-06-29 12:43:09 -05:00
AlgorithmX2
4c999e1f2b Fixed Minor Compile Error. 2014-06-29 12:30:38 -05:00
AlgorithmX2
e99d675897 Fixed Priority Screens. 2014-06-29 04:06:21 -05:00
AlgorithmX2
36f81cf0b7 MORE Gui work for crafting 2014-06-29 04:06:07 -05:00
AlgorithmX2
85f607b76f Merge branch '1.7.10' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 20:53:09 -05:00
AlgorithmX2
5c2d66aa28 1.7.10 - requires, guess what -- 1.7.10 2014-06-28 20:33:32 -05:00
AlgorithmX2
780131f9ab Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into 1.7.10 2014-06-28 20:32:51 -05:00
AlgorithmX2
297c957787 Master requires 1.7.2 2014-06-28 20:32:07 -05:00
AlgorithmX2
96b5115538 IC2 Api Update. 2014-06-28 20:26:43 -05:00
AlgorithmX2
8dc2c04afd 1.7.10 Deprecations. 2014-06-28 20:26:29 -05:00
AlgorithmX2
a84d513eda Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 18:03:17 -05:00
AlgorithmX2
b3cb822d1d Use IC2 Api to get tier. 2014-06-28 18:02:14 -05:00
AlgorithmX2
e5e373ce10 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 17:34:03 -05:00
AlgorithmX2
6718fae629 Initial 1.7.10 IC2 API Update. 2014-06-28 17:32:40 -05:00
AlgorithmX2
1cbda9e7ae 1.7.10 deprecations. 2014-06-28 17:32:20 -05:00
AlgorithmX2
c8bdf1bd45 Crafting Plan Screen is almost done. 2014-06-28 15:18:36 -05:00
AlgorithmX2
3031d60fc4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 00:36:48 -05:00
AlgorithmX2
9191d8d29e Split RF into RF Tiles and RF Items, should fix some crashes. 2014-06-28 00:25:54 -05:00
AlgorithmX2
d77da8c62d Post Cache Construction Event should fire before things access grid caches. 2014-06-28 00:21:37 -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
1c67f8bab7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-27 14:23:15 -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
20de41caca Fix forcePlan Flag. 2014-06-27 00:45:10 -05:00
AlgorithmX2
115c3e597a API Sync, IBaseMonitor 2014-06-27 00:44:56 -05:00
AlgorithmX2
d47bc43af5 Negate effect of back porting a fix. 2014-06-26 21:58:40 -05:00
AlgorithmX2
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
AlgorithmX2
2a8c028ab9 minor cpu gui work. 2014-06-26 21:47:26 -05:00
AlgorithmX2
5cec61d4f2 Should fix the energy cell sync. 2014-06-26 20:23:29 -05:00
AlgorithmX2
215c097506 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-25 23:02:22 -05:00
AlgorithmX2
c7692d1be6 Fixed Bug: #0562 - Inventory desync while dismantle storage cells
Fixed a bug where disassembling storage cells might put items in the players armor slots.
2014-06-25 21:57:49 -05:00
AlgorithmX2
9b65cc210d Update MFR Rednet API 2014-06-25 21:19:20 -05:00
AlgorithmX2
4ab4b335c3 Started work on Crafting CPU Gui 2014-06-25 20:49:37 -05:00
AlgorithmX2
27772725d8 MC .10 compatibility patch. 2014-06-24 20:19:42 -05:00
AlgorithmX2
6a11d18e32 compile on .10 2014-06-24 17:58:14 -05:00
AlgorithmX2
93b0c9bac0 Marked Terminal as InvTweaks Proof hopefully no more duping items? 2014-06-24 12:00:12 -05:00
AlgorithmX2
fdf3272fe0 Added Molecular Assembler Render. 2014-06-23 22:55:16 -05:00
AlgorithmX2
f41c5793fe Fix an issue where interfaces would not cause storage buses to re-check their status. 2014-06-23 00:08:38 -05:00
AlgorithmX2
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
AlgorithmX2
d730fe17b1 Interfaces now drop there items properly. 2014-06-22 23:51:20 -05:00
AlgorithmX2
12c0abbac6 Crafting calculations are now synchronized with the world thread to prevent possible CME's 2014-06-22 23:50:56 -05:00
AlgorithmX2
ff9a10b926 Crafting is virtually working 100% 2014-06-22 02:00:38 -05:00
AlgorithmX2
65e9e272c4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-21 11:57:38 -05:00
AlgorithmX2
dd9c85e43e Prevent block updates while loading parts; Should fix http://openeye.openmods.info/crashes/baf3e72a51ad8a5b8680ec24a819bc86 2014-06-20 12:12:48 -05:00
AlgorithmX2
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
AlgorithmX2
fea125a993 implement validForPass on network code. 2014-06-20 02:10:54 -05:00
AlgorithmX2
d1b91bb490 Fix pattern corruption. 2014-06-20 02:10:28 -05:00