Commit graph

906 commits

Author SHA1 Message Date
Aidan Brady
73c41f7863 Sorters can now directly eject into inventories 2013-12-04 22:17:56 -05:00
Aidan Brady
b84445c9ea Smarter Logistical Transporter future insert calculation 2013-12-04 22:04:51 -05:00
Aidan Brady
6cc198cf0b Bins are nice to hoppers now. 2013-12-04 21:55:56 -05:00
Aidan Brady
38dda1d18e Fix name, add a few more particle effects 2013-12-04 20:01:27 -05:00
Aidan Brady
64f681c263 Jetpack work! 2013-12-04 19:14:27 -05:00
Aidan Brady
aca0692cec Fix a few jetpack things 2013-12-04 17:22:00 -05:00
Aidan Brady
bf9d48d86f Work on jetpacks - specifically networking fixes and sounds! 2013-12-04 16:53:58 -05:00
Aidan C. Brady
aadd4fb741 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-04 15:43:16 -05:00
Aidan C. Brady
2914a4201d Fix a few bugs, work on jetpack networking 2013-12-04 15:43:03 -05:00
Aidan
4ffee46861 Merge pull request #623 from Vexatos/patch-2
Updated de_DE.lang
2013-12-04 09:45:26 -08:00
Vexatos
538fdbcce4 Couldn't you have done this yourself? Nevermind... 2013-12-04 15:31:31 +01:00
Aidan Brady
91eafd02aa Fixed IC2 tiers 2013-12-04 07:19:43 -05:00
Aidan Brady
82f7b0f761 Work on jetpack 2013-12-04 07:16:28 -05:00
Aidan Brady
7182d07cbd Bugfixes and the beginnings of jetpacks! 2013-12-03 23:36:06 -05:00
Aidan Brady
e9b18c1a35 Cleanup 2013-12-03 18:00:06 -05:00
Aidan Brady
f492ff7ee9 Hopefully fixed ENet crash with IC2 2013-12-03 16:57:57 -05:00
Aidan Brady
afe85f9215 Fix some pesky bugs and crashes 2013-12-03 16:56:03 -05:00
Aidan C. Brady
54fa437cb1 A few fixes 2013-12-03 16:50:00 -05:00
Aidan C. Brady
a45a6e43f3 Fix solar generation 2013-12-03 16:23:45 -05:00
Calclavia
1698043508 Merge pull request #604 from Vexatos/patch-2
Update de_DE.lang
2013-12-03 06:48:54 -08:00
Vexatos
278b46a8dd Update de_DE.lang 2013-12-03 15:39:26 +01:00
Aidan Brady
934d537230 Fix a few issues 2013-12-03 07:18:40 -05:00
Aidan
95ab48086c Merge pull request #600 from Vexatos/patch-2
Update de_DE.lang
2013-12-03 04:17:14 -08: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
Vexatos
c0b57017df Update de_DE.lang 2013-12-03 07:48:00 +01:00
Aidan Brady
06b806e871 Add wildcard support to entire recipe system 2013-12-02 23:26:18 -05:00
Aidan Brady
47fd7799ff Fix up recipe system to accept wildcard blocks 2013-12-02 22:42:54 -05:00
Aidan Brady
a3fa18cb80 Remove superconductor, make Heat Gen cheaper 2013-12-02 22:35:46 -05:00
Aidan
516ca00b15 Merge pull request #594 from sethwoodworth/master
format link to mod's forum post
2013-12-02 19:15:11 -08:00
Aidan Brady
dc8a00a140 Fix a few issues 2013-12-02 21:37:11 -05:00
Aidan Brady
30237b34ac Delete old textures, add Copper and Tin blocks 2013-12-02 20:52:44 -05:00
Seth Woodworth
1791db3cf6 format link to mod's forum post 2013-12-02 20:22:34 -05:00
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