Commit graph

569 commits

Author SHA1 Message Date
Aidan C. Brady
7cc72e65b3 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-08 07:53:40 -05:00
Aidan C. Brady
8f33094e10 Start on RR algorithm 2013-11-08 07:53:32 -05:00
Aidan Brady
1aec33d8ec Added configuration option to turn off strict input colors 2013-11-07 21:27:12 -05:00
Aidan Brady
7053f4a30a Whoops! 2013-11-07 19:17:24 -05:00
Aidan Brady
9fdcb13faa Gas Tank recipe shows up in NEI 2013-11-07 19:15:58 -05:00
Aidan Brady
c02c53475d Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-07 16:59:43 -05:00
Aidan Brady
1df2209f25 Use proper obfuscation 2013-11-07 16:59:37 -05:00
Aidan C. Brady
d1089148f9 Don't accept a max over 64 2013-11-07 09:16:11 -05:00
Aidan Brady
b6446032ae Attempt to clean up pathfinder 2013-11-07 08:47:18 -05:00
Aidan Brady
86e920fc0b Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-06 22:37:48 -05:00
Aidan Brady
daeb09c7fd Fix Energy Cubes up/down render 2013-11-06 22:37:41 -05:00
Aidan C. Brady
67e2672197 Fix a few issues with min/max 2013-11-06 21:33:41 -05:00
Aidan Brady
1f59e441b8 Fix a few things 2013-11-06 19:44:52 -05:00
Aidan Brady
44addd9c75 Untested max/min support 2013-11-06 19:32:00 -05:00
Aidan Brady
8fdfe8d1ea Items render smaller 2013-11-06 17:52:30 -05:00
Aidan Brady
d2894d0c9d Began work on a more advanced ItemStack filter system, with min and max pull ranges 2013-11-06 17:19:02 -05:00
Aidan C. Brady
b1f2a61e20 Minor changes, nothing noticeable 2013-11-06 16:04:34 -05:00
Aidan Brady
a80b18b412 Remove printlns 2013-11-05 20:39:54 -05:00
Aidan Brady
51813050b0 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-05 20:35:05 -05:00
Aidan Brady
961537a560 Revert to old Crusher texture 2013-11-05 20:35:02 -05:00
Aidan C. Brady
f27381453c Updated BuildCraft API, implemented full-fledged BC energy support, allowed Logistical Transporters to connect to BuildCraft machines, allowed Logistical Transporters to output to double chests, fixed energy leak 2013-11-05 20:07:38 -05:00
Aidan C. Brady
e2e9c791a2 Fix robit render! 2013-11-05 07:49:26 -05:00
Aidan Brady
88d0d3125e Fix side color thingy! 2013-11-04 21:27:41 -05:00
Aidan Brady
1ff600b4a9 Added configurable restrictive input colors to all configurable machines, added some dandy sound effects 2013-11-04 21:11:09 -05:00
Aidan Brady
3b746e4a1d Fix wrenching 2013-11-04 16:59:19 -05:00
Aidan Brady
d825154bf6 Fixed Pressurized Tube connection render to Gas Tanks 2013-11-04 16:03:08 -05:00
Aidan C. Brady
99a603549a BioGenerator fancy biofuel render :D 2013-11-04 15:39:49 -05:00
Aidan
a23a0844fb Merge pull request #359 from mattchance/master
Fix crash when using a wrench on a GasTank
2013-11-03 19:48:36 -08:00
Matt Chance
716c0b0c8b Fix crash when using a wrench on a GasTank 2013-11-03 17:53:11 -05:00
Aidan Brady
01a6174fdb Lots of things! 2013-11-03 16:54:33 -05:00
Aidan Brady
b12d9ce65a Fix swapped colors 2013-11-03 12:55:10 -05:00
Aidan Brady
c3fa020561 New Electric Pump model! 2013-11-03 12:07:23 -05:00
Aidan Brady
2ecc48021d Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-03 11:38:39 -05:00
Aidan Brady
6d734c26e3 New models and fixes! 2013-11-03 11:38:36 -05:00
Ben Spiers
8fe921eebe Add config option to allow powering Railcraft and other MJ machines without BC loaded. Hopefully won't cause bugs... 2013-11-03 10:26:43 +00:00
Aidan Brady
65012d8427 Fix up inventory insert calculation 2013-11-03 00:14:54 -04:00
Aidan Brady
dcea9fa8f5 Item rendering :D 2013-11-02 21:19:01 -04:00
Aidan Brady
4e77e677ed Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-02 21:18:52 -04:00
Aidan Brady
64fe3a21ea Fix typo, start work on fancy Energy Cube rendering :) 2013-11-02 21:07:55 -04:00
Ben Spiers
3c3bc631f0 Update en_US.lang
Manganese was misspelled
2013-11-02 23:19:43 +00:00
Aidan Brady
d1a1e3375a New Metallurgic Infuser model, more efficient active state management 2013-11-02 19:06:56 -04:00
Aidan Brady
2a73dc3332 Gave the Solar Generator a new model 2013-11-02 12:00:29 -04:00
Aidan C. Brady
289a2ee227 Configurable machine output colors 2013-11-02 01:31:32 -04:00
Aidan Brady
799142198a Fixed ridiculous client updates when GUI is open, fancy active sorter rendering, sorter eject sound effect :) 2013-11-01 23:51:10 -04:00
Aidan Brady
8db9c734d7 Sorter no longer requires energy, gave sorter new fancy model, improved the way items retreat from dead ends 2013-11-01 22:36:06 -04:00
Aidan Brady
c281fcb14b Fix up a bunch of issues. This should fix epicbastion's problem honestly. 2013-11-01 19:14:02 -04:00
Aidan C. Brady
35a83f5ffc Fix crash! 2013-11-01 14:04:05 -04:00
Aidan C. Brady
cb30b11d64 Killed the rest of the references 2013-11-01 11:38:33 -04:00
Aidan C. Brady
9b4bd09958 Remove the rest of the Theoretical Elementizer references 2013-11-01 11:36:29 -04:00
Aidan C. Brady
91a8839203 Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal. 2013-11-01 11:33:00 -04:00