Commit graph

874 commits

Author SHA1 Message Date
Aidan Brady
c0c003a337 Fix a crash 2013-12-02 19:29:49 -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 Brady
75cccf96a8 Slightly speed up Digital Miner 2013-12-02 18:54:21 -05:00
Aidan Brady
067c55491a Make deserts allow for 50% more solar generation 2013-12-02 18:38:18 -05:00
Aidan Brady
f81139a297 Update donators list :) 2013-12-02 18:32:12 -05:00
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
f7b0af6b0a Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-02 16:39:50 -05:00
Aidan C. Brady
d470ac1901 Some wire fixes 2013-12-02 16:39:43 -05:00
Aidan
eb711cf7bc Merge pull request #587 from Vexatos/patch-3
Update de_DE.lang
2013-12-02 10:46:44 -08:00
Vexatos
f5f9dca4ee Update de_DE.lang 2013-12-02 19:08:17 +01: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
3d01d103ae Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-02 09:24:58 -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
53604dd4b3 Updated UE API 2013-12-02 21:37:58 +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
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