Commit graph

826 commits

Author SHA1 Message Date
Calclavia 3cca65f2cd Fixed non-multipart wire textures 2013-12-01 17:02:39 +08:00
Calclavia 0967677907 Forgot to add CC-Lib 2013-12-01 15:32:46 +08:00
Calclavia cb11a9525f Added multipart to library 2013-12-01 15:29:59 +08:00
Calclavia 57bcf19035 Fixed connecting to un-interfacable TE sides 2013-12-01 15:27:58 +08:00
Calclavia ab32553c2d Added TE support for universal wires 2013-12-01 15:14:17 +08:00
Calclavia 7c79270259 Fixed multipart wire render 2013-12-01 14:50:06 +08:00
Calclavia cf792366f6 Merge branch 'master' into universal-wires 2013-12-01 14:41:10 +08:00
Calclavia f17982f85d Updated UE API 2013-12-01 14:41:01 +08:00
Calclavia a674e14851 Fixed wire texture not loading 2013-12-01 14:33:30 +08:00
Calclavia 10bbcff077 Fixed Multipart wires not loading 2013-12-01 14:30:54 +08:00
Calclavia 139d878542 Merge branch 'master' into universal-wires 2013-12-01 14:11:55 +08:00
Calclavia e967becb5c Fixed build dropbox link 2013-12-01 14:11:47 +08:00
Calclavia 1aabe8f7b5 Added insulation texture 2013-12-01 14:11:14 +08:00
Calclavia 138038e7f1 Merge branch 'master' into universal-wires 2013-12-01 14:01:49 +08:00
Calclavia 84166436c5 ChickenBones' website down. Using DropBox instead. 2013-12-01 14:01:44 +08:00
Calclavia 4804f8f335 Merge branch 'master' into universal-wires 2013-12-01 13:58:18 +08:00
Calclavia 892cf8fb07 Fixed OreDict crashing due to loading before item/block initiation 2013-12-01 13:58:12 +08:00
Calclavia f4d95a8129 Merge branch 'master' into universal-wires 2013-12-01 13:54:34 +08:00
Calclavia 7a2155c869 Made vanilla electric furnace load when Mekanism Generators is not loaded 2013-12-01 13:54:05 +08:00
Calclavia 43b4306f4b Got Induction module loading again 2013-12-01 13:51:33 +08:00
Calclavia 361d1ae380 Readded vanilla electric furnace but it's DISABLED by default 2013-12-01 13:50:02 +08:00
Calclavia 0205d7722e Readded universal wires into Mekanism Induction 2013-12-01 13:46:15 +08:00
Aidan Brady 4dec7c01ff Fixed OreDict integration 2013-12-01 00:29:08 -05:00
Calclavia deaed38c50 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-01 13:23:48 +08:00
Calclavia f560eb3c39 Moved OreDict to init phase 2013-12-01 13:23:27 +08:00
Aidan Brady e562562661 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-01 00:16:04 -05:00
Aidan Brady f853deb9c0 fixed API once again! :) 2013-12-01 00:15:52 -05:00
Calclavia 8588c90881 Added energy tablet to OreDict for external recipe usage 2013-12-01 13:09:12 +08:00
Aidan Brady 406be48069 Revert "Added energy tablet to OreDict for recipes"
This reverts commit de4742e65c.
2013-12-01 00:04:20 -05:00
Aidan Brady 36218ae086 Merge branch 'master' of https://github.com/aidancbrady/Mekanism
commit de4742e65c.
2013-12-01 00:04:08 -05:00
Aidan Brady 199ce13dcd Re-add EnumColor to API! 2013-12-01 00:03:40 -05:00
Calclavia de4742e65c Added energy tablet to OreDict for recipes 2013-12-01 12:48:57 +08:00
Aidan Brady 5d949ec959 Fixed API for @micdoodle8 2013-11-30 23:19:24 -05:00
Aidan Brady 96d2a12948 Fixed that bug, @BevoLJ! 2013-11-30 13:06:44 -05:00
Aidan Brady 1be0d218af Final fix for now - fixed electric machine GUIs 2013-11-30 12:48:22 -05:00
Aidan Brady 2c754cd506 Merge GasUtils into GasTransmission 2013-11-30 12:37:47 -05:00
Aidan Brady 0715a890bd Fixed tank bug, thanks @Not_steve! Closes #553. 2013-11-30 12:34:18 -05:00
Aidan Brady a4ab6db57b Fixes! 2013-11-30 12:29:49 -05:00
Aidan Brady 0c618a1cf3 Localization & gas fixes 2013-11-30 11:31:18 -05:00
Aidan 4c67bef17e Merge pull request #548 from Vexatos/patch-2
Localizationirizing the new stuff into de_DE.lang.
2013-11-30 08:15:39 -08:00
Vexatos e2a432fe11 Update de_DE.lang 2013-11-30 08:47:03 +01:00
Aidan Brady 14fb453bb8 Change the way UE integration works in Universal Cables 2013-11-30 01:28:40 -05:00
Aidan Brady 150c5dee0b Fix RF support 2013-11-30 01:02:44 -05:00
Aidan Brady 82933393c7 Fix a minor tank update issue 2013-11-30 00:47:11 -05:00
Aidan Brady ba32a2b112 More localization support! 2013-11-30 00:43:54 -05:00
Aidan Brady b224a01f39 Work on localization support, move around some API classes to make better compatibility 2013-11-30 00:28:02 -05:00
Aidan Brady 686cca5032 A few fixes and enhancements 2013-11-29 21:31:39 -05:00
Aidan Brady 0f61c5d50c A few fixes, and fancy Configurator GUI hovering! 2013-11-29 19:11:07 -05:00
Aidan Brady 30eff7f7fb Overthought something! 2013-11-29 18:22:43 -05:00
Aidan Brady 69d1c5961e Fix batteries 2013-11-29 18:19:18 -05:00