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

123 commits

Author SHA1 Message Date
AlgorithmX2 306ee9e036 Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv2 2014-09-17 11:25:30 -05:00
AlgorithmX2 2913d71acd Removed All Dead Integration. 2014-09-17 10:37:51 -05:00
AlgorithmX2 f233d5aefc Sort pure crystals to have higher priority. 2014-09-16 23:23:19 -05:00
AlgorithmX2 4b8cc401d8 Initial rv1 beta merge. 2014-09-13 15:12:47 -05:00
AlgorithmX2 1cb05052f2 Updated Craft Guide Integration to match new version of Recipe System. 2014-09-11 23:06:46 -05:00
AlgorithmX2 e0ef2f4e3d Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv2 2014-08-30 20:12:25 -05:00
AlgorithmX2 964bea7ebc Fixed Bug: #0998 - crash with latest version of better chests 2014-08-30 11:30:22 -05:00
AlgorithmX2 489d6e4262 Auto Reflection Based TileEvents. 2014-08-28 02:39:52 -05:00
AlgorithmX2 0139c5b35c Fixed NEI Facade Handler, should say 4 facades output, instead of 1. 2014-08-26 17:22:31 -05:00
AlgorithmX2 fd49074ea4 Whoops - Also tested, works fine. 2014-08-19 21:02:37 -05:00
AlgorithmX2 8102614048 Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-08-19 15:01:35 -05:00
AlgorithmX2 6e7721c36b Untested NEI Packet Update, this should hopefully fix issue with metadata ( not ore dictionary crafting, as well as some non oredictionary group issues like Pure vs Not Pure quartz. 2014-08-19 15:00:32 -05:00
AlgorithmX2 4d758d75ee Fixed Bug: #0921 - P2P tunnel cannot be attuned to RF 
Added Several Mekaism Attunements.
Added Several Ender IO Attunements.
Added Several Extra Utilities Attunements.
Added TE Cell / Dynamo Attunements.
 2014-08-19 00:42:54 -05:00
AlgorithmX2 e3c5c9545a Added Facade Crafting to NEI. 
Also added some helpful text to charged quartz, and meteorite presses.
 2014-08-13 20:26:41 -05:00
AlgorithmX2 4883dfb78c Added BetterStorage Integration for Storage Crates 
Also some old integration clean up.
 2014-08-12 11:58:24 -05:00
AlgorithmX2 36cd261683 Fixed Bug: #0830 - Microblocks disappear after shift-click on cable 
You can now place AE2 parts in the same block as Immibis Microblocks
 2014-08-08 01:40:17 -05:00
AlgorithmX2 3a93c8115c Fix Integration Stages 2014-08-08 00:36:31 -05:00
AlgorithmX2 476d9a478a Re-did DuplicateItems, into Ore Camo Feature, better logic, and better config. 2014-08-02 18:09:41 -05:00
AlgorithmX2 ab78f940db Optimized Imports. 2014-07-25 21:52:21 -05:00
AlgorithmX2 6766f8f0f8 Fixed #0681 - Cable Anchors Disappear when placed on Mekanism Cable 2014-07-25 20:16:00 -05:00
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 37440cdcbe Whoops Missing file. 2014-07-23 17:45:21 -05:00
AlgorithmX2 8bcd346226 Storage Buses no longer assume an inventory can be accessed just because it implements IInventory. 2014-07-23 17:39:42 -05:00
AlgorithmX2 980dff203f IntegrationType Re-factor. 2014-07-23 17:26:23 -05:00
AlgorithmX2 6aab1c2e35 Show Channel Usage for smart and dense cable in Waila. 
Waila Plugin now works when parts are in FMP Tiles.
 2014-07-22 00:47:24 -05:00
AlgorithmX2 92171d36d3 Storage Buses should only update the grid when their target changes. 
don't set the item count via IDSU unless the count changes ( ignore full inventories )
 2014-07-21 22:50:40 -05:00
AlgorithmX2 cc76e2329c Fix NEI Tooltips. 2014-07-14 22:30:32 -05:00
AlgorithmX2 706389376c Added Extra Utilities Energy Pipe as attunement for RF 2014-07-13 01:51:55 -05:00
AlgorithmX2 d2e332eedb Fixed NEI Ghost Overlays. 2014-07-09 22:18:50 -05:00
AlgorithmX2 6ce5a8f4c5 Improved NEI Integration and Pattern Terminal Support 2014-07-06 01:52:29 -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 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 9b65cc210d Update MFR Rednet API 2014-06-25 21:19:20 -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 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
AlgorithmX2 0c4e285f9d Added NEI Recipe for Charged Quartz. 2014-06-08 16:24:21 -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 faad4a6ba2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-04 00:07:57 -05:00
AlgorithmX2 286baaa0a5 Fied Bug: #0482 - Class not found (asm) on build 16 & 17 2014-06-04 00:06:20 -05:00
AlgorithmX2 883292a7b1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-03 20:49:40 -05:00
AlgorithmX2 09ef3cc231 Protect AE2 from BC's shenanigans. 2014-06-03 20:32:33 -05:00
AlgorithmX2 a1af4443b7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-02 19:32:51 -05:00
AlgorithmX2 ba525621a6 Stop Examining other mods recipes. 2014-06-02 12:01:37 -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 baf5e66144 inWorldPurification messages split for each item, to improve clarity. 2014-05-31 20:57:20 -05:00
AlgorithmX2 ef7a1592e7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 18:35:44 -05:00