Commit graph

2360 commits

Author SHA1 Message Date
AlgorithmX2
3c510b6925 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java
2014-05-03 14:12:19 -05:00
AlgorithmX2
b9ef599e13 Network tool can now lock Storage/Conversion Monitors.
Buckets no longer place when trying to insert them into a network via Conversion Monitor.
2014-05-03 02:51:56 -05:00
AlgorithmX2
bba2f3ba25 Less null Items 2014-05-02 01:03:02 -05:00
AlgorithmX2
cc8c3bb75e Implemented 5% Tunnel Tax. 2014-05-02 00:40:46 -05:00
AlgorithmX2
da764470a4 Use Cable from EiO to attune redstone flux. 2014-05-02 00:22:22 -05:00
AlgorithmX2
cd5e4caf7b Added P2P RF Tunnel.
Added Added thread local for network recursion for later ( 1.8 ).
2014-05-02 00:00:14 -05:00
AlgorithmX2
5bacb015e5 Ported, but did not enable GT 1.7 2014-05-01 21:50:04 -05:00
AlgorithmX2
40de3da454 Added Railcraft Integration. 2014-05-01 21:49:19 -05:00
AlgorithmX2
6b87e36bb3 Bug: #0386 - Memory Card not detect flat ME Interface
Interface parts can share Settings with bocks.
2014-05-01 00:41:19 -05:00
AlgorithmX2
9238a530bb Added World and Grindstone NEI Plugins. 2014-05-01 00:32:58 -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
c904033567 Fix for FMP facade conflict. 2014-04-29 01:44:13 -05:00
AlgorithmX2
8a9136cbb3 Attempt Number two are making config generation consistent. 2014-04-28 15:00:53 -05:00
AlgorithmX2
f6a132e19e Null Check. 2014-04-28 13:19:41 -05:00
AlgorithmX2
62166f1e94 Fix Bug: #0373 - Interface dont Drop Items (Items Lost) 2014-04-27 23:50:50 -05:00
AlgorithmX2
c72ce5ba06 Prevent Materials from crashing if they are disabled. 2014-04-27 23:50:26 -05:00
AlgorithmX2
1d5e5679b3 Meteorite Chests now can contain other nuggets, and not use AE's nuggets when they are disabled. 2014-04-27 23:49:14 -05:00
AlgorithmX2
34abc147bc Minimum of 3 rows. 2014-04-26 21:54:08 -05:00
AlgorithmX2
a29afb9dd9 Fiber don't use power. 2014-04-26 21:53:30 -05:00
AlgorithmX2
f21bf3e9bc Added Basic Restrictions on slots in MAC. 2014-04-24 20:55:29 -05:00
AlgorithmX2
eadd67a34c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-24 02:14:58 -05:00
AlgorithmX2
722d065c2c Storage monitors now use display lists. 2014-04-24 02:14:18 -05:00
AlgorithmX2
fafa79e657 Monitors now use render caching. 2014-04-24 02:14:07 -05:00
AlgorithmX2
27b9d0f4cd Energy FX is now much more light weight. 2014-04-24 02:13:52 -05:00
AlgorithmX2
07a98270c3 Fixed #0356 - Scrollbar is locked after right click searchbox 2014-04-24 02:13:33 -05:00
AlgorithmX2
e95da25144 Started Work in MAC Gui. 2014-04-24 01:14:26 -05:00
AlgorithmX2
589e2d60d2 Pattern slots now report the output qty as well as the item type, at all times ( not just when shift is held ) 2014-04-23 00:30:29 -05:00
AlgorithmX2
94951b4209 Render output of pattern when shift is held. 2014-04-23 00:18:44 -05:00
AlgorithmX2
a5c2c7244d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-22 22:03:09 -05:00
AlgorithmX2
ea7e4b68bb Fixed issue with lower power drains appearing to be "Free power" 2014-04-22 21:55:06 -05:00
AlgorithmX2
6f96e0c364 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-22 21:49:11 -05:00
AlgorithmX2
021e924098 Fixed issue with error prone Grid Visitors.
Increased Channel update speed.
Renamed Controller Method.
2014-04-22 21:49:03 -05:00
AlgorithmX2
85f15e7c06 Pattern Renderer ( for shift ) 2014-04-22 20:36:26 -05:00
AlgorithmX2
8a5a4b3097 Prioritize Pattern Slots. 2014-04-22 20:36:07 -05:00
AlgorithmX2
49c7f9a93b Cache Tanks, might be a minor performance benefit. 2014-04-21 16:11:39 -05:00
AlgorithmX2
e9759f681e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-20 13:53:43 -05:00
AlgorithmX2
fa307b467e Facades and FMP parts can no longer overlap. 2014-04-19 23:35:48 -05:00
AlgorithmX2
2e71a6530e Added NEI Sync. 2014-04-19 23:35:13 -05:00
AlgorithmX2
c5f2a3914e Fixed Bug: #0347 - 'Search Box Mode' and 'Terminal Style' are not saved/loaded 2014-04-19 23:12:25 -05:00
AlgorithmX2
cb42ce164c Move RenderManager interaction to Post Init ( fixes some kind of weird conflict with a key bind mod ) 2014-04-19 20:41:43 -05:00
AlgorithmX2
18e96644d6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-17 22:52:47 -05:00
AlgorithmX2
3d06bb3ba5 Fixed bug with Import Bus with 4 accelerators only pulling 64 items. ( should be 96 ) 2014-04-17 22:52:21 -05:00
AlgorithmX2
323342314c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-17 22:39:59 -05:00
AlgorithmX2
a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2
cb81f34db3 Added IMC Support for P2P / Grinder / Spatial / MatterCannon 2014-04-17 21:52:39 -05:00
AlgorithmX2
572352c18e Networks now run at 1x speed.
Illuminated Panels now use proper channel and power settings.
2014-04-17 19:44:51 -05:00
AlgorithmX2
67d46d57d2 Patterns can now be encoded.
Added a clear button to the Pattern Terminal.
Added description to the Encoded Pattern Item.
2014-04-17 01:15:56 -05:00
AlgorithmX2
f14581edae Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-16 23:39:03 -05:00
AlgorithmX2
4ee886c6ac Added Pattern Terminal Crafting. 2014-04-16 23:38:43 -05:00
AlgorithmX2
f5fc2ba18e Removed Terminal style from Portable Cell Gui.
Portable Cell now only shows 3 rows now, like it should.
Security Gui now has the proper width.
Fixed bug introduced in #90 to show background behind security terminal slots.
2014-04-16 13:48:03 -05:00