Commit graph

624 commits

Author SHA1 Message Date
Aidan Brady
e17d290531 Fix? 2013-11-16 19:10:55 -05:00
Aidan Brady
ae0edd50dc Fix Universal Cable TE support, fix build.xml 2013-11-16 19:08:47 -05:00
Aidan Brady
67db8c522a Fix TE support :) 2013-11-16 18:56:01 -05:00
Aidan Brady
e9382e64a9 Fixes! 2013-11-16 17:23:50 -05:00
Aidan C. Brady
f2fd5c382f Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-16 16:55:27 -05:00
Aidan C. Brady
57b1343311 Batteries are less buggy and more efficient 2013-11-16 16:55:20 -05:00
Aidan
763e123570 Merge pull request #409 from Vexatos/patch-2
No more wires? :(
2013-11-16 13:34:28 -08:00
Aidan Brady
7af161de3a Fix build again 2013-11-16 16:33:46 -05:00
Vexatos
a6e017549c No more wires? :( 2013-11-16 21:43:02 +01:00
Aidan Brady
a2f667baf5 Fixed! :D 2013-11-16 13:38:34 -05:00
Aidan C. Brady
3ec8a3bdb1 Modify build to package MekanismInduction 2013-11-16 13:04:06 -05:00
Aidan C. Brady
5954d51ad4 TE item support fixes 2013-11-16 12:56:43 -05:00
Aidan C. Brady
0616f28950 Fix test build 2013-11-16 12:49:41 -05:00
Aidan C. Brady
43440ebc4e Register Induction module :) 2013-11-16 12:30:40 -05:00
Aidan C. Brady
19b6d30f4c Fix crash 2013-11-16 12:27:43 -05:00
Aidan C. Brady
cc48b614ba Remove wire 2013-11-16 12:26:49 -05:00
Aidan C. Brady
dc59bebc33 Fixed EM Contractor 2013-11-16 12:12:17 -05:00
Aidan C. Brady
15e3369f15 Fix TE crash (temp) 2013-11-16 11:06:17 -05:00
Aidan C. Brady
ed637e4eed Follow Mekanism naming standards 2013-11-16 11:05:04 -05:00
Aidan C. Brady
53323279c7 MekanismInduction module - done!
Still need to configure the build
2013-11-16 10:21:37 -05:00
Aidan C. Brady
3d4625ddb9 Block-ID & Metadata based machine types, preparing for RI merge 2013-11-15 14:59:26 -05:00
Aidan C. Brady
3193f786cd Official Redstone Flux support complete!
(As far as I know at least)
2013-11-15 12:06:03 -05:00
Aidan Brady
ec98b19ffb Begin work on official TE2 integration :)
(Items done!)
2013-11-14 21:58:32 -05:00
Aidan Brady
8101ee2e26 A few fixes 2013-11-14 16:31:02 -05:00
Aidan C. Brady
be3063def5 Minor rendering enhancements 2013-11-14 08:12:09 -05:00
Aidan C. Brady
33283f5428 GL_LIGHTING 2013-11-14 07:48:18 -05:00
Aidan Brady
a29b637a0a Minor tool cleanups 2013-11-13 22:43:58 -05:00
Aidan Brady
d08c6da830 Fixed tool harvest levels 2013-11-13 17:21:00 -05:00
Aidan Brady
c209f8233a Bins are done :) 2013-11-13 16:19:41 -05:00
Aidan C. Brady
c9b5c7b51f Some work on rendering, fixed sound error 2013-11-13 14:59:11 -05:00
Aidan C. Brady
f24c12044d Merge branches 'master' and 'master' of https://github.com/aidancbrady/Mekanism 2013-11-13 08:12:34 -05:00
Aidan C. Brady
b04ff8d5cc Bins only have accessible slots on top and bottom 2013-11-13 08:12:25 -05:00
Aidan Brady
4d55db7a73 Some work on Bin item rendering 2013-11-12 22:43:06 -05:00
Aidan C. Brady
8e08c9adb8 Once and for all fixed ConcurrentModificationException 2013-11-12 20:19:06 -05:00
Aidan C. Brady
3b64a043df Bins can eject and accept items in block form, transporter support untested 2013-11-12 20:14:21 -05:00
Aidan C. Brady
1e336047d2 Bin block-based inventory work 2013-11-12 19:18:22 -05:00
Aidan C. Brady
e6ed263aa3 More bin work! :D 2013-11-12 18:42:55 -05:00
Aidan C. Brady
fe0631844b Some work on Bins 2013-11-12 16:45:48 -05:00
Aidan C. Brady
42fe1f3d69 Bin inventory management works! I have no idea how I managed this... 2013-11-12 11:01:16 -05:00
Aidan Brady
2a4a1cd291 Some more work on Bin crafting management. Don’t know if this is gonna work guys… 2013-11-11 23:57:33 -05:00
Aidan Brady
8cec8af952 Perhaps fixed a few bugs 2013-11-11 23:19:51 -05:00
Aidan Brady
80097e4d1b Some work on bins, currently crashing if you try to craft 2013-11-11 22:52:12 -05:00
Aidan Brady
1ac243f091 Work on bins! :) 2013-11-11 19:27:36 -05:00
Aidan Brady
f6704dc5ea Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException 2013-11-11 17:23:14 -05:00
Aidan C. Brady
9c53f1be66 Some work on bins, fix tank bug 2013-11-11 17:08:13 -05:00
Aidan C. Brady
4b5c8498a3 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-11 14:38:03 -05:00
Aidan C. Brady
3c0c5bef0d Major Universal Cable improvements, started work on Bin 2013-11-11 14:37:56 -05:00
Aidan Brady
5ad16564a3 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-10 19:35:52 -05:00
Aidan Brady
e277ee36c0 Fix some pathfinder bugs 2013-11-10 19:35:45 -05:00
Aidan C. Brady
99f53a1322 Some fancy sounds and tooltips 2013-11-10 18:54:30 -05:00