Aidan Brady
|
b75cbc5eaf
|
Fix crash
|
2013-12-02 18:12:33 -05:00 |
|
Aidan C. Brady
|
57ffc071cf
|
Fixed a crash and wire names
|
2013-12-02 17:11:39 -05:00 |
|
Aidan C. Brady
|
57caab2062
|
Wire fixes
|
2013-12-02 17:04:41 -05:00 |
|
Aidan C. Brady
|
d470ac1901
|
Some wire fixes
|
2013-12-02 16:39:43 -05:00 |
|
Aidan C. Brady
|
5c2c8e15cb
|
Add in necessary models
|
2013-12-02 12:41:00 -05:00 |
|
Aidan C. Brady
|
054cba30e3
|
Wire code cleanup!
|
2013-12-02 12:27:57 -05:00 |
|
Aidan C. Brady
|
6781af7447
|
Clean up wire code, remove fancy furnace thing as I'm going to be implementing another form of a low-end generator soon
|
2013-12-02 12:18:38 -05:00 |
|
Aidan C. Brady
|
e38cf10ef6
|
Merge branch 'universal-wires' of https://github.com/aidancbrady/Mekanism
|
2013-12-02 11:42:21 -05:00 |
|
Aidan C. Brady
|
bb1dceb064
|
Fix up Copper and Tin dust smelting recipes. Most recommended build as of now.
|
2013-12-02 11:38:27 -05:00 |
|
Aidan C. Brady
|
e9c39bcf3d
|
Fix ore gen
|
2013-12-02 11:32:45 -05:00 |
|
Aidan C. Brady
|
9290c76c05
|
Add custom Osmium Ore generation rates, generate Copper and Tin ores
|
2013-12-02 11:20:25 -05:00 |
|
Aidan C. Brady
|
20d3eb42b2
|
Add needed ingot recipes & textures
|
2013-12-02 09:24:52 -05:00 |
|
Calclavia
|
7396daa038
|
Re-enabled multipart
|
2013-12-02 21:41:17 +08:00 |
|
Calclavia
|
29741b999a
|
Merge branch 'master' into universal-wires
|
2013-12-02 21:38:03 +08:00 |
|
Calclavia
|
11adb89791
|
Removed unnessary "instanceof"
|
2013-12-02 21:17:25 +08:00 |
|
Aidan C. Brady
|
1e51ddfa9a
|
Add config option to override UE ratios
|
2013-12-02 07:59:52 -05:00 |
|
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 |
|
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 |
|
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 |
|