Commit graph

772 commits

Author SHA1 Message Date
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
AlgorithmX2
04797294bb implemented validForPass on all inventory handlers; allowed crafting to skip second pass. 2014-06-20 02:10:02 -05:00
AlgorithmX2
755e87f006 Fixed bug with accelerator detection. 2014-06-20 02:07:52 -05:00
AlgorithmX2
e732304cac Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-19 20:19:28 -05:00
AlgorithmX2
5c0ac30bf9 Prevent Config from saving during loading process. 2014-06-19 16:15:34 -05:00
AlgorithmX2
f574f7533d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-19 01:36:07 -05:00
AlgorithmX2
77dcf6c5cf Fix Storage bus when tiles change without blocks. 2014-06-19 01:35:46 -05:00
AlgorithmX2
b8a8f2f202 Crafting is now possible ( not complete but possible ) 2014-06-19 01:28:45 -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
0a18f2d926 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-17 23:36:53 -05:00
AlgorithmX2
d7ca8e519a Improve No Biomes crash, and don't register Spatial if spatial is disabled. 2014-06-17 16:46:01 -05:00
AlgorithmX2
6084ac4e80 Fix Failed Insert Loop in IO Port. 2014-06-17 16:45:26 -05:00
AlgorithmX2
f807f18239 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-16 22:55:57 -05:00
AlgorithmX2
ba27380edf Fixed Bug: #0500 - Craftable Invalid Items 2014-06-16 22:44:17 -05:00
AlgorithmX2
d287b30c01 Fixed http://openeye.openmods.info/crashes/2d45b58c95514ec3d9a1b49703e53de9 2014-06-16 22:43:41 -05:00
AlgorithmX2
83d3a3aadb Crafting calculator now supports damageable items, and ore dictionary stuff in primitive form. 2014-06-16 22:36:35 -05:00
AlgorithmX2
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
AlgorithmX2
472d5cb1c0 Request Crafting Packet. 2014-06-16 00:49:37 -05:00
AlgorithmX2
92f728be67 Crafting Calculator mostly works now - is missing features however. 2014-06-16 00:48:43 -05:00
AlgorithmX2
730200ed8d Multi-block clean up should be cleaner now. 2014-06-13 14:39:36 -05:00
AlgorithmX2
ed85b174c6 Fuzzy no longer matches ore dictionary less items as the same.
aka Bug: #0534 - Import Bus with Fuzzy Card does not work with damaged items
2014-06-13 13:42:38 -05:00
AlgorithmX2
0324dc62b9 Creative Tab now available server side; fixes https://github.com/Dynious/RefinedRelocation/issues/83 2014-06-13 13:41:50 -05:00
AlgorithmX2
4763069fab Removed Vec3Pool 2014-06-13 12:42:09 -05:00
AlgorithmX2
5dec6e7003 Cell Type Usage Fixed. 2014-06-12 09:37:08 -05:00
AlgorithmX2
e0ebec1a60 Umm crafting calculation needs some thought... 2014-06-12 09:18:39 -05:00
AlgorithmX2
734663f521 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-11 00:44:00 -05:00
AlgorithmX2
4f4dbc4307 Fixed Crash with Fuzzy Upgrade in Export Bus. 2014-06-11 00:22:55 -05:00
AlgorithmX2
ef2e3bc7cb Seeds now make sense with item automation. 2014-06-11 00:21:03 -05:00