d84ec9c0bf
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-10 17:19:26 -05:00
570f098f81
Fixed a few more rendering/visual update glitches.
2014-05-10 13:27:48 -05:00
08d6942643
Added all the crafting cpu "blocks" - needs textures and renders.
...
Updated API
2014-05-10 00:00:02 -05:00
2f071e7341
Style issue.
2014-05-09 20:29:42 -05:00
1ba7feac9f
Fixed minor render issue with glass cables connected to machines.
2014-05-09 20:29:24 -05:00
98fc460da0
Removed Old RF Api.
2014-05-09 09:42:52 -05:00
f031972fcd
Started working on crafting infrastructure and C-Cpus
2014-05-08 23:10:12 -05:00
b0aedc1b01
MAC Now shows progress.
2014-05-08 23:09:42 -05:00
740a1022a4
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-08 19:14:05 -05:00
5675f5c5fd
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2
2014-05-08 14:43:30 -05:00
50e27d121b
Client doesn't need to init tiles, thats for the networks on the server.
2014-05-08 14:41:39 -05:00
d0229a16de
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-08 01:02:10 -05:00
c11e3ba588
TESR update packets should no longer cause block updates.
2014-05-08 01:00:29 -05:00
6532af979d
Molecular Assembler Single Pattern Mode "works"
2014-05-08 00:58:43 -05:00
39282b8e14
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-07 20:54:49 -05:00
0338902021
No more null icons!
2014-05-07 20:54:28 -05:00
b4e8dada38
Crafting progress might be a thing.
2014-05-07 19:59:05 -05:00
dd74fce634
Added some assertions about null icons.
2014-05-07 17:21:48 -05:00
db1495085f
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2
2014-05-07 12:49:59 -05:00
4abe3e8807
Fix Crash when adding trades when items are disabled.
2014-05-07 12:49:32 -05:00
1db9283eed
Swapped out Gui Sync with something a little more fancy.
2014-05-07 00:22:42 -05:00
24d497e583
MAC Gui upgrade slots and network tool fixes.
2014-05-06 21:21:12 -05:00
046ab3f1e8
Recipe files no longer require a blank line at the end.
2014-05-06 20:53:01 -05:00
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
50aa0b9062
Added GrinderLogging and hid Grinder Logging behind it.
2014-05-06 14:56:06 -05:00
93aad6c53b
Fixed Crash with Extra Utilities.
...
Items in the ore dictionary values no longer fail to migrate.
Fixed "Meta Overlap detected" error.
Recipes now work with new Materials/Parts.
2014-05-06 12:08:48 -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
66a7e191a4
If you have more then 10,000 of any part it now properly converts to "10k" instead of showing an unlocalized string
2014-05-04 19:24:42 -05:00
9c5c92401b
Lower Cable TESR Distance to 30.0f
2014-05-04 17:53:32 -05:00
4d5a6ce301
Add Stained Glass facades.
...
The Item Bus Renderer can now deal with Alpha Pass.
2014-05-04 15:46:38 -05:00
788dbb8610
Fixed possible crash with Interfaces and Storage Buses.
2014-05-04 14:54:21 -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
60d1ecc965
Storage bus can now update all the way down to zero items for External Storages.
2014-05-03 23:14:30 -05:00
5dbba26930
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
2014-05-03 19:23:48 -05:00
e1c6b18399
Special Handlers are now properly wrapped in IMEMonitors for Storage Bus to function properly.
2014-05-03 19:21:33 -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
5f58bdc785
Note for later about Facade Change.
2014-05-03 19:20:03 -05:00
56daf3a2c2
Facades no longer prevent annihilation planes from picking up items.
2014-05-03 17:11:19 -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
44f1f70326
Removed Duplicate Method from RV1
2014-05-03 14:25:03 -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
bba2f3ba25
Less null Items
2014-05-02 01:03:02 -05:00
cc8c3bb75e
Implemented 5% Tunnel Tax.
2014-05-02 00:40:46 -05:00
AlgorithmX2