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 |
|
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
|
7ebd132b6e
|
Fixed teslas, merged Electrostatic Linker into Configurator
|
2013-12-01 14:03:00 -05:00 |
|
Aidan Brady
|
f55d3ac874
|
Added Factory input slot distribution, configurable voice ports, fixed several bugs
|
2013-12-01 12:38:34 -05: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 |
|
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
|
10bbcff077
|
Fixed Multipart wires not loading
|
2013-12-01 14:30:54 +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 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 |
|
Aidan Brady
|
cd62f593fa
|
Fix possible infinite loop
|
2013-11-29 17:37:00 -05:00 |
|