Commit graph

1270 commits

Author SHA1 Message Date
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
02ace8145f Current for BC 6.0.12 release 2014-05-11 13:31:25 -05:00
AlgorithmX2
a04bc65e35 Code Style / Cleanup 2014-05-11 13:30:54 -05:00
AlgorithmX2
34048d45a2 Don't erase inventory when someone asks for the drops... 2014-05-11 13:30:36 -05:00
AlgorithmX2
bd5e80fba1 Facades should use names, not ids. 2014-05-11 11:41:31 -05:00
AlgorithmX2
f7e638c172 changing facades now updates the world render. 2014-05-11 11:30:00 -05:00
AlgorithmX2
9ad9c7b370 Added BC 6x support for facades and added builder support. 2014-05-11 11:28:34 -05:00
AlgorithmX2
1f126054e4 Moved NEI Helpers. 2014-05-11 11:27:32 -05:00
AlgorithmX2
5771c19146 30k -> 2mb item size limit. 2014-05-11 11:25:15 -05:00
AlgorithmX2
32f7e58cf0 Update API for metadata flag. 2014-05-11 11:24:46 -05:00
AlgorithmX2
03f938516a Ore no longer rotates. 2014-05-11 11:22:10 -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
2f071e7341 Style issue. 2014-05-09 20:29:42 -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
b0aedc1b01 MAC Now shows progress. 2014-05-08 23:09:42 -05:00
AlgorithmX2
740a1022a4 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-08 19:14:05 -05:00
AlgorithmX2
5675f5c5fd Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-08 14:43:30 -05:00
AlgorithmX2
50e27d121b Client doesn't need to init tiles, thats for the networks on the server. 2014-05-08 14:41:39 -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
6532af979d Molecular Assembler Single Pattern Mode "works" 2014-05-08 00:58:43 -05:00
AlgorithmX2
39282b8e14 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-07 20:54:49 -05:00
AlgorithmX2
0338902021 No more null icons! 2014-05-07 20:54:28 -05:00
AlgorithmX2
b4e8dada38 Crafting progress might be a thing. 2014-05-07 19:59:05 -05:00
AlgorithmX2
dd74fce634 Added some assertions about null icons. 2014-05-07 17:21:48 -05:00
AlgorithmX2
db1495085f Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-07 12:49:59 -05:00
AlgorithmX2
4abe3e8807 Fix Crash when adding trades when items are disabled. 2014-05-07 12:49:32 -05:00
AlgorithmX2
1db9283eed Swapped out Gui Sync with something a little more fancy. 2014-05-07 00:22:42 -05:00
AlgorithmX2
24d497e583 MAC Gui upgrade slots and network tool fixes. 2014-05-06 21:21:12 -05:00
AlgorithmX2
046ab3f1e8 Recipe files no longer require a blank line at the end. 2014-05-06 20:53:01 -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
50aa0b9062 Added GrinderLogging and hid Grinder Logging behind it. 2014-05-06 14:56:06 -05:00
AlgorithmX2
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
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
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
AlgorithmX2
9c5c92401b Lower Cable TESR Distance to 30.0f 2014-05-04 17:53:32 -05:00
AlgorithmX2
4d5a6ce301 Add Stained Glass facades.
The Item Bus Renderer can now deal with Alpha Pass.
2014-05-04 15:46:38 -05:00
AlgorithmX2
788dbb8610 Fixed possible crash with Interfaces and Storage Buses. 2014-05-04 14:54:21 -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