3351af3d4e
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
items/materials/MaterialType.java
util/Platform.java
2014-05-06 20:45:38 -05:00
5bf8e9d7d0
Updated RF Api ( should work for old api too - at least temporary ).
2014-05-06 18:09:31 -05:00
e60faf5ab0
Remove Meta values from Config.
...
Fixed a number of rendering gltiches with Smart/Covered Cables
2014-05-06 00:16:29 -05:00
3080510317
Major Update for Cable Rendering.
...
TESRs will are no longer used if the tile contains no dynamic renders.
Added alpha pass rendering for stained glass.
Enabled Stained Glass facades.
Cables / Facades have less geometry by hiding faces on connected boxes.
Added AlphaPass Option to disable AlphaPass Cables rendering ( fixes crash with Immbis Microblocks. )
2014-05-04 19:51:05 -05:00
86c096c357
One Last fix for BC Facdes :(
2014-05-04 19:39:29 -05:00
0ed7cd7bb4
BC Facades work again.
2014-05-04 14:54:07 -05:00
e25014fd5b
Storage Buses no longer error on load.
2014-05-03 23:15:26 -05:00
5dbba26930
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-03 19:23:48 -05:00
21e40a5fb3
Fix failure ghost contents when breaking an inventory on a storage bus.
2014-05-03 19:20:54 -05:00
58763ef17f
Removed Pointless value.
2014-05-03 19:20:20 -05:00
bed34bf9b5
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-03 15:29:42 -05:00
6ff118e2b7
Annihilation Plane and Formation Plane no update their renders properly.
2014-05-03 14:25:37 -05:00
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
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
cc8c3bb75e
Implemented 5% Tunnel Tax.
2014-05-02 00:40:46 -05:00
cd5e4caf7b
Added P2P RF Tunnel.
...
Added Added thread local for network recursion for later ( 1.8 ).
2014-05-02 00:00:14 -05:00
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
c904033567
Fix for FMP facade conflict.
2014-04-29 01:44:13 -05:00
f6a132e19e
Null Check.
2014-04-28 13:19:41 -05:00
62166f1e94
Fix Bug: #0373 - Interface dont Drop Items (Items Lost)
2014-04-27 23:50:50 -05:00
a29afb9dd9
Fiber don't use power.
2014-04-26 21:53:30 -05:00
eadd67a34c
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-24 02:14:58 -05:00
722d065c2c
Storage monitors now use display lists.
2014-04-24 02:14:18 -05:00
fafa79e657
Monitors now use render caching.
2014-04-24 02:14:07 -05:00
a5c2c7244d
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-22 22:03:09 -05:00
49c7f9a93b
Cache Tanks, might be a minor performance benefit.
2014-04-21 16:11:39 -05:00
e9759f681e
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-20 13:53:43 -05:00
fa307b467e
Facades and FMP parts can no longer overlap.
2014-04-19 23:35:48 -05:00
18e96644d6
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-17 22:52:47 -05:00
3d06bb3ba5
Fixed bug with Import Bus with 4 accelerators only pulling 64 items. ( should be 96 )
2014-04-17 22:52:21 -05:00
323342314c
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-17 22:39:59 -05:00
a4eb01b191
Allow security hand shakes for monitorables.
2014-04-17 22:33:48 -05:00
572352c18e
Networks now run at 1x speed.
...
Illuminated Panels now use proper channel and power settings.
2014-04-17 19:44:51 -05:00
f14581edae
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-16 23:39:03 -05:00
9f7e809662
Terminals show now drop View Cells.
2014-04-16 11:59:37 -05:00
506b7a7129
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-14 02:39:39 -05:00
36dad44a6a
Fixed Hit Boxes on Import Bus, Interface, Storage Bus, P2P Tunnels
2014-04-10 22:54:28 -05:00
2de3ab4505
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-10 22:02:23 -05:00
79bbdd0bd1
host now responsible for cleanup, fixes onWrench MultiPart deletion.
2014-04-10 15:01:04 -05:00
f8d60e801a
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-10 00:59:15 -05:00
661afe846c
Fixed Bug with P2P Tunnels not disconnecting in certain cases.
2014-04-10 00:58:56 -05:00
d84be03027
Large chunk on the pattern terminal.
2014-04-09 23:51:08 -05:00
01c76a6870
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-09 20:12:49 -05:00
ac0c562b02
Fixed Channel requirements for illuminated panels.
2014-04-09 14:22:36 -05:00
db6a958a6f
Fix Interface Crash caused by negative items.
2014-04-09 14:22:17 -05:00
7dc251611c
tiny progress...
2014-04-08 21:56:59 -05:00
6203b172f6
Better Solution for extra energy injection. ( Fixes Crash )
2014-04-07 21:31:36 -05:00
0cec53eece
More Pattern Terminal Stuff.
2014-04-07 21:25:41 -05:00
2ebca04296
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-07 19:47:39 -05:00
7a0674a75b
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2
2014-04-07 19:46:27 -05:00
AlgorithmX2