fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
979 Commits 45 Branches 194 Tags
88f2abbfd4fbdbd5b70ff6cae7e28dca946a7dbf
Commit Graph

96 Commits

Author SHA1 Message Date
AlgorithmX2 99f15f36b7 Fix NEI Plugin to work with new Recipe Setup. 
Added Config option to not show colored cables in recipes.
Fortify Recipe System vs OreDicionary Late entries.
 2014-07-25 19:31:12 -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 298ae41198 Refactor Some Class stuff out in favor of StorageChannel. 2014-07-23 14:11:12 -05:00
AlgorithmX2 c5aabb1c34 Minor Refactor. 2014-07-23 13:55:48 -05:00
AlgorithmX2 253221e494 Improved Blocking Behavior for interfaces with inventories on multiple sides. 
AE now ignores inventories that have no sizes this will improve a few strange behaviors.
 2014-07-23 11:47:59 -05:00
AlgorithmX2 175e21782a Fixed Bug: #0693 - Shutting Down (crash) when Interrupting path to crafting. 2014-07-23 09:22:39 -05:00
AlgorithmX2 3ef02cb485 Interfaces now filter additions to hide crafting from super-nets. 2014-07-21 16:28:52 -05:00
AlgorithmX2 3ec4d8495e Fixed Bug: #0603 - Anvil Repair of Quartz Tools 2014-07-12 17:57:53 -05:00
AlgorithmX2 8f65aad67b Fixed MA Crash with processing Patterns. 2014-07-12 17:14:28 -05:00
AlgorithmX2 6fd32c3b12 Fixed Interface Crash. 2014-07-12 16:28:55 -05:00
AlgorithmX2 1541998281 Sync up rv0 branch fixes into rv1 2014-07-08 19:36:20 -05:00
AlgorithmX2 2ea77d35bc Delay Block Updates, and save the world! 2014-07-07 23:54:28 -05:00
AlgorithmX2 6ce5a8f4c5 Improved NEI Integration and Pattern Terminal Support 2014-07-06 01:52:29 -05:00
AlgorithmX2 8ad1f6515c Moar Sanity Checking! 2014-07-04 01:19:45 -05:00
AlgorithmX2 ab68154885 Search By Mod ID 2014-07-02 21:09:17 -05:00
AlgorithmX2 98f83ad5e4 instead of itemid use the Item system hash. for hash generation purposes should improve lookup type stuff. 2014-07-02 00:06:44 -05:00
AlgorithmX2 215c097506 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-25 23:02:22 -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 ff9a10b926 Crafting is virtually working 100% 2014-06-22 02:00:38 -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 92f728be67 Crafting Calculator mostly works now - is missing features however. 2014-06-16 00:48:43 -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 4763069fab Removed Vec3Pool 2014-06-13 12:42:09 -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 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 76de1cf185 Item Tunnels now cycle Outputs. 2014-06-08 18:54:38 -05:00
AlgorithmX2 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
AlgorithmX2 1ab7f7c110 Ditch AABBPool 2014-06-04 22:59:56 -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 3746c49d49 Fixed http://openeye.openmods.info/crashes/45620002c5dacfe15acc8e1e37187991 and friends. 2014-05-29 11:41:47 -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 bc55956d56 Crafting Amount Gui Mostly Done, missing "Next Button" 2014-05-23 23:20:56 -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 a8a4476e8e Fixed issue with ore cache, should now properly contain all the options instead of just the current item. 2014-05-21 21:08:38 -05:00
AlgorithmX2 569ed2f99e Bad Fuzzy Logic for Non-Damageable Items. 2014-05-21 21:08:13 -05:00
AlgorithmX2 cb0a450853 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-21 09:44:02 -05:00
AlgorithmX2 0f781cebba Sided TIlehash should make order matter. 2014-05-21 09:43:41 -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 9ba1b133d7 Fixed Bug: #0432 - Weird Inventory behavior in Quartz Cutting Knife 
Removed logging from Migration Items.
Improved logging for http://openeye.openmods.info/crashes/42defba4fcc4c4571a45edaaba3af4c3
Improved logging for http://openeye.openmods.info/crashes/cbda180edb2fba39c4fe27a7f5266fec
 2014-05-14 10:55:45 -05:00
AlgorithmX2 a04bc65e35 Code Style / Cleanup 2014-05-11 13:30:54 -05:00
AlgorithmX2 788dbb8610 Fixed possible crash with Interfaces and Storage Buses. 2014-05-04 14:54:21 -05:00
AlgorithmX2 60d1ecc965 Storage bus can now update all the way down to zero items for External Storages. 2014-05-03 23:14:30 -05:00
AlgorithmX2 e1c6b18399 Special Handlers are now properly wrapped in IMEMonitors for Storage Bus to function properly. 2014-05-03 19:21:33 -05:00
AlgorithmX2 4a2c7c2710 Fixed issue with NEI and font size. 
Added Crafting Terminal Integration for NEI.
Added Inscriber Recipe Plugin for NEI.
 2014-04-30 23:01:22 -05:00
AlgorithmX2 a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2 27f374eb04 Added Rotatable Blocks integration. 2014-04-03 23:12:35 -05:00