AlgorithmX2
25a588f303
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
...
Conflicts:
container/AEBaseContainer.java
core/sync/AppEngPacketHandlerBase.java
2014-05-13 19:25:07 -05:00
AlgorithmX2
9ba6f195fd
Removed Logging from BC Tunnel.
2014-05-12 21:20:22 -05:00
AlgorithmX2
f4e685a0e8
Fix Crashes for MJ5.
...
Disable MJ6
2014-05-11 17:01:31 -05:00
AlgorithmX2
be645f3e2f
MJ 6 + MJ 5 Integration.
2014-05-11 16:13:37 -05:00
AlgorithmX2
ce561ffbe3
Merge in Builder support.
2014-05-11 13:48:14 -05:00
AlgorithmX2
f7e638c172
changing facades now updates the world render.
2014-05-11 11:30:00 -05:00
AlgorithmX2
d84ec9c0bf
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-10 17:19:26 -05:00
AlgorithmX2
570f098f81
Fixed a few more rendering/visual update glitches.
2014-05-10 13:27:48 -05:00
AlgorithmX2
08d6942643
Added all the crafting cpu "blocks" - needs textures and renders.
...
Updated API
2014-05-10 00:00:02 -05:00
AlgorithmX2
3491fe4e33
Did what I could with mj6
2014-05-09 21:08:56 -05:00
AlgorithmX2
1ba7feac9f
Fixed minor render issue with glass cables connected to machines.
2014-05-09 20:29:24 -05:00
AlgorithmX2
98fc460da0
Removed Old RF Api.
2014-05-09 09:42:52 -05:00
AlgorithmX2
f031972fcd
Started working on crafting infrastructure and C-Cpus
2014-05-08 23:10:12 -05:00
AlgorithmX2
d0229a16de
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-08 01:02:10 -05:00
AlgorithmX2
c11e3ba588
TESR update packets should no longer cause block updates.
2014-05-08 01:00:29 -05:00
AlgorithmX2
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
AlgorithmX2
5bf8e9d7d0
Updated RF Api ( should work for old api too - at least temporary ).
2014-05-06 18:09:31 -05:00
AlgorithmX2
e60faf5ab0
Remove Meta values from Config.
...
Fixed a number of rendering gltiches with Smart/Covered Cables
2014-05-06 00:16:29 -05:00
AlgorithmX2
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
AlgorithmX2
86c096c357
One Last fix for BC Facdes :(
2014-05-04 19:39:29 -05:00
AlgorithmX2
0ed7cd7bb4
BC Facades work again.
2014-05-04 14:54:07 -05:00
AlgorithmX2
e25014fd5b
Storage Buses no longer error on load.
2014-05-03 23:15:26 -05:00
AlgorithmX2
5dbba26930
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-03 19:23:48 -05:00
AlgorithmX2
21e40a5fb3
Fix failure ghost contents when breaking an inventory on a storage bus.
2014-05-03 19:20:54 -05:00
AlgorithmX2
58763ef17f
Removed Pointless value.
2014-05-03 19:20:20 -05:00
AlgorithmX2
bed34bf9b5
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-03 15:29:42 -05:00
AlgorithmX2
6ff118e2b7
Annihilation Plane and Formation Plane no update their renders properly.
2014-05-03 14:25:37 -05:00
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
cc8c3bb75e
Implemented 5% Tunnel Tax.
2014-05-02 00:40:46 -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
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
c904033567
Fix for FMP facade conflict.
2014-04-29 01:44:13 -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
a29afb9dd9
Fiber don't use power.
2014-04-26 21:53:30 -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
a5c2c7244d
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-22 22:03:09 -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
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
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
f14581edae
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-04-16 23:39:03 -05:00
AlgorithmX2
9f7e809662
Terminals show now drop View Cells.
2014-04-16 11:59:37 -05:00
