Aidan C. Brady
|
4a499d6dac
|
Fix tank rendering, make Configurator serve as a BuildCraft wrench
|
2013-12-02 07:55:14 -05:00 |
|
|
Aidan Brady
|
5eba673468
|
Fixed Obsidian TNT render
|
2013-12-02 07:19:22 -05:00 |
|
|
Aidan Brady
|
f9d845a36b
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-02 07:19:03 -05:00 |
|
Calclavia
|
41415ab683
|
Placed UE higher in priority for energy production
|
2013-12-02 20:16:53 +08:00 |
|
|
Aidan Brady
|
684e1d6718
|
Add OreDict registrations, fix charcoal block reverse crafting
|
2013-12-02 07:16:09 -05:00 |
|
|
Calclavia
|
07332ca245
|
Merge branch 'master' into universal-wires
Conflicts:
common/mekanism/induction/common/MekanismInduction.java
resources/assets/mekanism/lang/en_US.lang
|
2013-12-02 19:47:38 +08:00 |
|
|
Calclavia
|
0ad768a3ef
|
Updated UE API
|
2013-12-02 19:45:20 +08:00 |
|
|
Aidan Brady
|
e42ab62e2a
|
Begin work on copper and tin ore and ingots :)
|
2013-12-01 21:58:35 -05:00 |
|
|
Aidan Brady
|
83bca26455
|
Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness
|
2013-12-01 17:45:19 -05:00 |
|
|
Aidan Brady
|
66cba8d50b
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-01 14:03:06 -05:00 |
|
|
Aidan Brady
|
7ebd132b6e
|
Fixed teslas, merged Electrostatic Linker into Configurator
|
2013-12-01 14:03:00 -05:00 |
|
|
Aidan
|
76f4fe8e1c
|
Merge pull request #570 from Vexatos/patch-2
Update de_DE.lang
|
2013-12-01 09:47:45 -08:00 |
|
Vexatos
|
aa4610330c
|
Update de_DE.lang
|
2013-12-01 18:43:13 +01:00 |
|
|
Aidan Brady
|
f55d3ac874
|
Added Factory input slot distribution, configurable voice ports, fixed several bugs
|
2013-12-01 12:38:34 -05:00 |
|
|
Aidan
|
cac520876a
|
Merge pull request #561 from Vexatos/patch-2
Shorten the GUI stuff. I hope it is short enough for the GUIs
|
2013-12-01 08:36:10 -08:00 |
|
|
Calclavia
|
c1d5e2bc60
|
Fixed non-multipart insulated wire texture
|
2013-12-01 18:05:27 +08:00 |
|
|
Calclavia
|
5865063fa0
|
Attempt to fix reflection InvocationTargetException
|
2013-12-01 17:39:22 +08:00 |
|
|
Calclavia
|
180401b8ef
|
Forgot to print-stack-trace
|
2013-12-01 17:17:19 +08:00 |
|
|
Calclavia
|
a1ae16b82c
|
Added console output for multipart disable
|
2013-12-01 17:08:19 +08:00 |
|
|
Calclavia
|
bf04c53415
|
Merge branch 'master' into universal-wires
|
2013-12-01 17:07:13 +08:00 |
|
|
Calclavia
|
a7a5248b24
|
Made logger set parent
|
2013-12-01 17:07:08 +08:00 |
|
|
Calclavia
|
3cca65f2cd
|
Fixed non-multipart wire textures
|
2013-12-01 17:02:39 +08:00 |
|
|
Vexatos
|
76b7ea116d
|
Shorten the GUI stuff. I hope it is short enough for the GUIs
|
2013-12-01 09:08:11 +01: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 |
|