Commit graph

3305 commits

Author SHA1 Message Date
Aidan C. Brady
cc5080d908 Cleanup 2015-03-18 07:50:17 -04:00
Aidan C. Brady
1b813b4142 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-18 07:48:59 -04:00
Aidan C. Brady
398fa5d01a Added that nullary constructor 2015-03-18 07:48:52 -04:00
Ben Spiers
4e3999ea9c Make the rendering of Induction Matrix internals a bit nicer. 2015-03-18 01:32:35 +00:00
Ben Spiers
60a32d44f6 CTM for the Induction Matrix internals. @aidancbrady, what do you think?
Feel free to revert if you preferred it how it was.
2015-03-18 01:10:52 +00:00
Aidan C. Brady
6502ee031b Cleaned up integration code, added minor aluminum ore processing. Adding new resources for full recipe processing is now stupid easy. 2015-03-17 20:22:15 -04:00
Ben Spiers
e9a3000e8d Add Optional removal of IToolHammer. Fixes #2216 2015-03-17 23:49:45 +00:00
Ben Spiers
01f37e552e Make induction ports work with connected textures. 2015-03-17 23:49:45 +00:00
Aidan C. Brady
ad2a354f45 Refactored Dust items, removed Obsidian ore processing (doesn't have a use considering Obsidian is just about entirely renewable) 2015-03-17 19:16:36 -04:00
Aidan C. Brady
f5d94ca1dc Perfected Portable Tank valve animation 2015-03-17 18:02:07 -04:00
Aidan C. Brady
3c39af45de Added Crescent Hammer support 2015-03-17 17:44:28 -04:00
Aidan C. Brady
6847a1e9ee Minor cleanup 2015-03-17 17:36:32 -04:00
Aidan C. Brady
1f28a9bfbf Transporters now have deeply integrated support for bins, including prediction algorithms 2015-03-17 17:30:40 -04:00
Aidan C. Brady
a5a9ab9daf Merge branch 'master' into development 2015-03-17 17:27:17 -04:00
Aidan C. Brady
088cd2f4d3 A few bin fixes 2015-03-17 17:26:59 -04:00
Aidan C. Brady
2749adcc06 Made sure transporters check strict inventory stack limits, fixed the AE2 interaction 2015-03-17 15:30:40 -04:00
Aidan C. Brady
c991e12bea Removed test recipe. IMC is done! 2015-03-17 10:50:45 -04:00
Aidan C. Brady
bfbddd3c47 Standardize the names of machine outputs 2015-03-17 10:29:09 -04:00
Aidan C. Brady
1071b57b7d IMC API for machines! 2015-03-17 08:43:41 -04:00
Aidan C. Brady
749c579bb3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-16 15:05:49 -04:00
Aidan C. Brady
71420a2550 Fixed PlayerSound fade effect 2015-03-16 15:05:43 -04:00
Ben Spiers
71a9bfc4f9 Make the @Optional removals stricter.
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
2015-03-16 15:48:19 +00:00
Aidan C. Brady
9db789674a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-16 11:43:41 -04:00
Aidan C. Brady
d1990c232d Finished off Oredictionificator 2015-03-16 11:43:28 -04:00
Ben Spiers
797308f587 Update Forge version.
Account for the random inexplicable non-existence of FMLRenderAccessLibrary
2015-03-16 15:22:19 +00:00
Aidan C. Brady
1580d968ec Updated CoFH API 2015-03-16 11:12:48 -04:00
Aidan C. Brady
77c68b05bf Merge branch 'master' into development 2015-03-16 11:03:07 -04:00
Aidan C. Brady
02cb425cbd Work on Oredictionificator operations 2015-03-16 11:02:54 -04:00
Aidan
9a704f2812 Merge pull request #2211 from Dannerick/myDev1
[#2210] fix for NPE on placing an empty gas-burning generator
2015-03-16 11:02:30 -04:00
Aidan C. Brady
d61723c5f7 Fixed a few issues - Oredictionificator filter system is done 2015-03-16 07:58:53 -04:00
Aidan C. Brady
2cd3d5d899 Work on GUI 2015-03-15 23:39:55 -04:00
brian lewis
2a1fe5b3e9 [#2210] fix for NPE on placing an empty gas-burning generator 2015-03-15 19:26:12 -05:00
Aidan C. Brady
f51c528bbf Added recipes for new v8 content 2015-03-15 17:57:15 -04:00
Aidan C. Brady
9f20e0bce0 Oredictionificator work 2015-03-13 20:37:20 -04:00
Aidan C. Brady
6870b211c5 Oredictionificator work 2015-03-13 10:20:19 -05:00
Aidan C. Brady
8a88df5f1c Start on Oredictionificator! 2015-03-13 09:14:57 -05:00
Aidan C. Brady
6e3efacffb Hide Heat Transmitter until it's finished 2015-03-12 23:48:13 -05:00
Aidan C. Brady
ca16c64de1 Fixed a crash 2015-03-12 23:37:04 -05:00
Aidan C. Brady
093d18e6fa Implemented a failsafe tick handler in FrequencyManager, fixed a small deactivation mishap 2015-03-12 23:29:11 -05:00
Aidan C. Brady
6801092113 Fixed data fetch 2015-03-12 23:17:25 -05:00
Aidan C. Brady
f9c10d9012 More work on teleporters, implemented chunkloading 2015-03-12 22:55:37 -05:00
Aidan C. Brady
9c21621c06 Just about finished! Teleporter & Portable Teleporter work with the new frequency system perfectly. 2015-03-12 17:30:40 -05:00
Aidan C. Brady
6d36926866 Work on Portable Teleporter, need to fix the screwed up GUI 2015-03-12 16:52:04 -05:00
Aidan C. Brady
9043e12938 Work on new Portable Teleporter GUI - going to basically be a clone of the regular teleporter GUI without an inventory view 2015-03-12 11:18:12 -05:00
Aidan C. Brady
d16a6f06ee Teleporting works! Tomorrow I'll try and implement the Portable Teleporter. 2015-03-12 01:32:24 -05:00
Aidan C. Brady
cefd4ba107 Fixed another NBT issue 2015-03-12 01:18:21 -05:00
Aidan C. Brady
c2c3bd14bc Many fixes - still need to get private frequencies to load 2015-03-12 01:03:31 -05:00
Aidan C. Brady
dc611eb0b2 Work on GUI, things are starting to work 2015-03-11 18:13:47 -05:00
Aidan C. Brady
76b93bec65 More teleporter work. Getting pretty complicated, hopefully I can pull this off 2015-03-11 17:42:33 -05:00
Aidan C. Brady
855a5acf1d Code cleanup 2015-03-11 15:41:13 -05:00