Commit graph

621 commits

Author SHA1 Message Date
MachineMuse
7053cbde8b xml parsing is go! 1 hardcoded file for now...but it should give you an idea of what the format should be 2013-04-29 11:14:27 -06:00
MachineMuse
6861f7e882 Complete model system rewrite, works perfectly >:3 now just need a gui for it 2013-04-29 10:42:51 -06:00
MachineMuse
dcc57b2e7c fix for shears module dropping leaves when no energy 2013-04-29 00:22:02 -06:00
MachineMuse
a2834c3f3e more model refactoring to unify rendering 2013-04-28 15:53:11 -06:00
MachineMuse
736d93b860 added new modelformatexception for obj loader 2013-04-28 14:30:46 -06:00
MachineMuse
a979bfff53 Merge remote-tracking branch 'origin/master' 2013-04-28 14:28:05 -06:00
MachineMuse
57b66488d9 more mussing about with model loading, nothing usable yet 2013-04-28 14:27:47 -06:00
Claire
639c5bdec8 Update RecipeManager.java 2013-04-28 14:05:13 -06:00
MachineMuse
a0da0e3de1 fixed model attachment points 2013-04-28 11:52:34 -06:00
MachineMuse
39999e3d51 More scaladerps DO NOT DOWNLOAD THIS YOU IDIOTS 2013-04-28 11:06:26 -06:00
MachineMuse
2fd195fadc Refactored electricity again and made 'on fire' damage not add heat when you are already overheating 2013-04-28 05:33:10 -06:00
MachineMuse
67208f27ad made forge version dependency explicit 2013-04-28 01:15:48 -06:00
MachineMuse
3a67eb4006 another gregtech recipe fix 2013-04-28 01:11:03 -06:00
MachineMuse
fcd501e5ff made Lux Capacitors not tick 2013-04-27 21:19:08 -06:00
Claire
10c7c12575 Merge pull request #212 from Andrew2448/MFFS
Minor tweaks on MFFS Field Teleporter and Grafter modules.
2013-04-27 01:34:54 -07:00
MachineMuse
4864afe592 fixed some more gregtech recipes c/o rjenkins8142 2013-04-27 02:33:07 -06:00
MachineMuse
bf6c120e6d made hud elements only render when no gui is open 2013-04-27 02:33:06 -06:00
Andrew2448
44c3fd5498 Add heat generation to the grafter module to prevent excessive use. 2013-04-26 22:43:52 -04:00
Andrew2448
602177edc3 Minor tweaks on MFFS Field Teleporter module. 2013-04-26 19:29:49 -04:00
Claire
dbd14b065d Merge pull request #207 from Andrew2448/MFFS
Added MFFSFieldTeleporter module.
2013-04-26 00:42:35 -07:00
MachineMuse
edf1feef2f more nullchecks??!?? 2013-04-26 01:26:25 -06:00
Andrew2448
fb8af398ac Tweak MFFSFieldTeleporter and OmniWrench modules. 2013-04-25 20:20:44 -04:00
Andrew2448
b725e8f279 Add MFFSFieldTeleporter module. Thanks to Minalien for the suggestion and API. 2013-04-25 19:53:31 -04:00
MachineMuse
ac2e55eca5 recommended push 2013-04-25 14:59:19 -06:00
MachineMuse
010cca1c66 more attempts at thaum render fixes 2013-04-25 12:27:51 -06:00
MachineMuse
5dcb80da18 changed .class to .TYPE for primitives in reflection 2013-04-25 11:47:30 -06:00
MachineMuse
38897473eb reflection tweak? 2013-04-25 11:45:54 -06:00
MachineMuse
ee562d953b another render event handler fix...reflection sucks 2013-04-25 11:33:17 -06:00
MachineMuse
86af87b8ef added stacktraces to thaum render event handler ?? 2013-04-25 11:30:00 -06:00
MachineMuse
10271bfc67 Another Thaumcraft API bit added 2013-04-25 10:40:48 -06:00
MachineMuse
fb8b28b574 Thaumcraft API added to build.xml 2013-04-25 10:27:53 -06:00
MachineMuse
519aa8709e Thaum goggles module 2013-04-25 10:19:20 -06:00
MachineMuse
200b1b00a7 Undo ic2 reversion 2013-04-25 06:19:45 -06:00
MachineMuse
08823ec6db fixed ic2 clean step in build.xml 2013-04-25 06:04:03 -06:00
MachineMuse
50de51b68d added ic2 clean step to build.xml 2013-04-25 06:01:37 -06:00
MachineMuse
cb7069c6ac reverted ic2 crap in build.xml 2013-04-25 05:58:36 -06:00
MachineMuse
2e066bce2f backporting everything for ic2 289 -.- 2013-04-25 05:55:03 -06:00
MachineMuse
981bcbde6f another fix for omniwrench module 2013-04-25 05:36:02 -06:00
MachineMuse
0608063c86 nother api fix 2013-04-25 04:38:02 -06:00
MachineMuse
03a76c5a84 ic2 recipe fix 2013-04-25 04:34:55 -06:00
MachineMuse
bf1daec29d updated ic2 api folders 2013-04-25 04:28:29 -06:00
MachineMuse
4047ffff92 bumped ic2 api in build script 2013-04-25 04:25:23 -06:00
MachineMuse
a5809a64fd IC2 support updated to 304 and fixed 2013-04-25 04:18:19 -06:00
MachineMuse
10b1e8bedb obfuscation fix for binoculars module 2013-04-24 19:09:10 -06:00
MachineMuse
4ab294fb51 fixed crash on thrust with no helmet 2013-04-24 18:33:47 -06:00
MachineMuse
468042ea46 multiplayer fix for binoculars 2013-04-24 18:29:42 -06:00
MachineMuse
58176c365b added the binoculars texture what the hell IDEA 2013-04-24 03:18:40 -06:00
MachineMuse
cbd875f78c Fixed some recipes and moved some modules to better spots 2013-04-24 03:02:44 -06:00
MachineMuse
e41df5a4c6 added binoculars 2013-04-24 02:30:25 -06:00
MachineMuse
85ce49016f added scala libs to buildscript 2013-04-23 23:44:54 -06:00