Commit graph

688 commits

Author SHA1 Message Date
Aidan
bf814dfae0 More quotes :( 2013-11-17 17:30:29 -05:00
Aidan
2cebebac83 Use UTF8-supported quotes 2013-11-17 17:24:35 -05:00
Aidan Brady
be73495110 …and part 2. Textures fixed. 2013-11-17 13:52:23 -05:00
Aidan Brady
80bdfc10b9 For some reason this is necessary. Part 1… 2013-11-17 13:52:10 -05:00
Aidan Brady
6a4750f90b Hopefully fixed sounds… 2013-11-17 13:39:40 -05:00
Aidan Brady
8095eb206c Fix textures, hopefully fix sounds 2013-11-17 13:31:56 -05:00
Aidan Brady
8a79352563 Debugging sound system 2013-11-17 13:23:19 -05:00
Aidan
400ccc56cd Update README.md 2013-11-17 12:32:57 -05:00
Aidan Brady
fe33689d13 Fixed OS X quote characters 2013-11-17 11:59:58 -05:00
Aidan Brady
a1f814a953 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-17 10:55:27 -05:00
Aidan Brady
17d36cad4d Fixes and enhancements for TE 2013-11-17 10:55:20 -05:00
Calclavia
ba9803e9d7 Fixed Mekanism not showing Minecraft version in builds 2013-11-17 19:35:14 +08:00
Aidan
dd23729d5e Merge pull request #413 from crafteverywhere/patch-1
Update zh_CN.lang
2013-11-16 19:26:26 -08:00
crafteverywhere
fdf09fcfde Update zh_CN.lang 2013-11-17 11:21:43 +08:00
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