Commit graph

82 commits

Author SHA1 Message Date
Aidan Brady
449822fef2 Fixed build 2013-12-05 22:33:28 -05:00
Aidan Brady
9c0358b38e Removed multimeter 2013-12-05 22:03:36 -05:00
Aidan Brady
c3a985f273 Kill off wires for the last time, fix up jetpacks 2013-12-05 21:10:15 -05:00
Aidan Brady
934d537230 Fix a few issues 2013-12-03 07:18:40 -05:00
Aidan Brady
e848849ed8 Revert "Kill BuildCraft energy support once and for all, thanks to the excellent work of KingLemming."
This reverts commit 1f2e792146.
2013-12-03 06:57:53 -05:00
Aidan Brady
a3fa18cb80 Remove superconductor, make Heat Gen cheaper 2013-12-02 22:35:46 -05:00
Aidan Brady
1f2e792146 Kill BuildCraft energy support once and for all, thanks to the excellent work of KingLemming. 2013-12-02 19:19:23 -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
Calclavia
7396daa038 Re-enabled multipart 2013-12-02 21:41:17 +08:00
Calclavia
11adb89791 Removed unnessary "instanceof" 2013-12-02 21:17:25 +08: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
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
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
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
5d949ec959 Fixed API for @micdoodle8 2013-11-30 23:19:24 -05:00
Aidan Brady
a4ab6db57b Fixes! 2013-11-30 12:29:49 -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
2e86b2a471 Better direct energy outputting 2013-11-29 17:17:01 -05:00
Aidan Brady
22fe896bcd Finish multi-ID machine support 2013-11-27 16:17:10 -05:00
Aidan Brady
dacc68e6c6 Gas API completely overhauled. Sorry @micdoodle8 :(
General cleanup, pressurized tubes are 40 times more efficient, a few enhancements, Miners balanced.
2013-11-26 20:11:26 -05:00
Calclavia
79354580b1 Added TE compatibility to multimeter 2013-11-25 19:18:24 +08:00
Aidan Brady
38d9bdd1d2 Start work on a connected texture renderer, remove old textures, fix recipes for Vaygrim’s issue (closes #481) 2013-11-24 18:54:11 -05:00
Aidan Brady
4a5df9f922 Fixed tesla texture 2013-11-23 10:42:23 -05:00
Aidan C. Brady
a9fde31c97 Fix client/server item accepting issue on contractor 2013-11-22 21:25:06 -05:00
Aidan C. Brady
0adc0dc75e Attempt to use my own unit system 2013-11-22 20:58:49 -05:00
Aidan C. Brady
a3d200291c GUI work... 2013-11-22 20:39:44 -05:00
Aidan C. Brady
649f128d76 Work on textures 2013-11-22 20:27:27 -05:00
Aidan C. Brady
cc46bebc43 Teslas are FIXED! :) 2013-11-22 20:00:18 -05:00