tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3292 commits 2 branches 0 tags 102 MiB
Commit graph

1279 commits

Author SHA1 Message Date
Aidan C. Brady
1cc277f2d9 Wind Turbine spinning animation is now much smoother and dependent only on height 2015-03-24 10:53:45 -04:00
Aidan C. Brady
0a14d064f3 Push matrix in item renderer 2015-03-24 10:36:56 -04:00
Aidan C. Brady
299d93e67d Fixed Laser Amplifier unit conversion 2015-03-24 08:56:02 -04:00
Aidan C. Brady
ca9ec78399 Make Laser Amplifier require an Advanced Induction Cell, fixed RF & EU display units 2015-03-24 08:46:41 -04:00
Aidan C. Brady
6892156454 Fixed Solar Evaporation Controllers not properly accepting buckets 2015-03-24 08:05:59 -04:00
Aidan C. Brady
96ccdb8f58 Fixed multiblock creation 2015-03-24 07:58:45 -04:00
Aidan C. Brady
f6f75e6ea1 Crash fix 2015-03-23 22:00:43 -04:00
Aidan C. Brady
5513859216 Cleanup, updated IC2 API 2015-03-23 20:34:43 -04:00
Aidan
8f0243d4b1 Merge pull request #2331 from halvors/minerfix 
Fixed OreDictionary filter in Miner not writing "requireStack" to NBT.
 2015-03-23 19:42:28 -04:00
Aidan C. Brady
2e79f61642 Fixed Seismic Reader reading wrong x and z coords 2015-03-23 19:41:27 -04:00
Halvor Lyche Strandvoll
7409a83088 Fixed OreDictionary filter in Miner not writing "requireStack" to NBT. 2015-03-24 00:32:04 +01:00
Aidan C. Brady
c52d41383f Fixed a few crashes 2015-03-22 22:52:37 -04:00
Aidan C. Brady
d2c6effabb Bump version to 8.0.2 2015-03-22 21:57:28 -04:00
Aidan C. Brady
62be3523d7 Fixed Gas Masks not working 2015-03-22 21:53:00 -04:00
Aidan C. Brady
4354357462 Added a null check 2015-03-22 21:41:59 -04:00
Aidan C. Brady
735217961c Fixed Configurator tooltip, fixed a major packet issue 2015-03-22 21:40:23 -04:00
Ben Spiers
4590a71759 Make the checking of instances of other mods' interfaces safer. 
Fixes (part of) #2316
 2015-03-23 01:11:45 +00:00
Ben Spiers
dfefcaf69a Fix #2303 2015-03-23 01:11:45 +00:00
Aidan C. Brady
e18cf2dd4a Fixed Digital Miner not auto-ejecting 2015-03-22 18:31:56 -04:00
Aidan C. Brady
36ffdeb0e5 Cleanup 2015-03-22 17:44:07 -04:00
Ben Spiers
1fe0484cd1 Fix notifyTileChanges() loading chunks. 2015-03-22 21:32:31 +00:00
Aidan C. Brady
c7d3b77112 Fixed another transition issue 2015-03-22 16:16:01 -04:00
Aidan C. Brady
2b2d9d69b3 Fixed transition crashes 2015-03-22 16:13:06 -04:00
Ben Spiers
09617fdb4c Gas Upgrade Recipe 2015-03-22 14:41:47 +00:00
Ben Spiers
0064f09d8c Backwards-compatibility for IGasHandler. #2267 2015-03-22 14:36:21 +00:00
Ben Spiers
050f3351e2 Fix advanced-recipe factories not using gas at first 2015-03-22 13:07:25 +00:00
Aidan C. Brady
d061792f3e Actually fix println 2015-03-22 01:33:25 -05:00
Aidan C. Brady
2ebb4838e8 Waila integration - fixes issues with Induction Cells & Induction Providers, also fixed println 2015-03-22 01:33:17 -05:00
Aidan C. Brady
e31d5573f1 Heat Generator now shows exact heat generation amount in GUI 2015-03-22 01:00:38 -05:00
Aidan C. Brady
d6c48a6e71 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-22 00:48:44 -05:00
Aidan C. Brady
9a2d47ad4b Default icons for all Mekanism blocks - fixes particle issues 2015-03-22 00:47:59 -05:00
Aidan C. Brady
dd96064a3f Fixed Electric Pump text overlap, fixed OreDict filter not reading from nbt/packet properly 2015-03-22 00:40:05 -05:00
Ben Spiers
c0281d4470 Fix #2298 2015-03-22 02:23:45 +00:00
Ben Spiers
a7c812bc6e Reduce paramaters of the reactor for more challenging balance. 
Now requires 1GJ to ignite, and produces half as much power in passive mode.
The product of thermocouple efficiency and the laser input bonus must not be more than 1, (was previously 10) or energy from a laser that is absorbed (multiplied by the bonus coefficient) then propagates through the code and is multiplied by the thermocouple efficiency will come out bigger than it went in.
This would make the most efficient usage of a reactor simply shining a laser at it and pulling power out, producting net +49.5kJ/t.
This is now rectified, the product of bonus and thermocouple is now 0.5.
 2015-03-22 02:16:17 +00:00
Aidan C. Brady
f8f1467304 Cleanup 2015-03-21 17:23:36 -05:00
Aidan C. Brady
e089413f30 Laser Amplifier now properly saves and loads its inventory from NBT 2015-03-21 17:18:14 -05:00
Ben Spiers
c323969c87 Recalcuation things. 2015-03-21 19:44:17 +00:00
Ben Spiers
83e41478e5 Localisation, icon, fixes. 2015-03-21 19:13:15 +00:00
Ben Spiers
2e8edb281c Gas Upgrades. 2015-03-21 19:13:04 +00:00
Ben Spiers
0658e04880 Fix upgrade dupe with factories. 2015-03-21 19:12:55 +00:00
Ben Spiers
9936c05da7 Recipe and upgrade fixes. 2015-03-21 19:11:56 +00:00
Aidan C. Brady
84a1fa95ae Require a Hohlraum filled up to the max with D-T fuel in order to trigger a reaction 2015-03-21 12:44:37 -05:00
Aidan C. Brady
46eb5aa288 Fixed Hohlraum check crash 2015-03-21 12:42:41 -05:00
Aidan C. Brady
79d319cc87 Fixed temperature units 2015-03-21 11:51:11 -05:00
Aidan C. Brady
72026dd1c5 Lasers now dynamically damage entities based on energy output 2015-03-21 11:31:51 -05:00
Aidan C. Brady
765b58a058 Fixed a transition crash 2015-03-21 11:11:24 -05:00
Aidan C. Brady
a31449c2d3 Fixed the crafting issue - it was fairly silly, actually 2015-03-21 00:50:19 -05:00
Aidan C. Brady
3305581373 Fixed Precision Sawmill not applying secondary outputs 2015-03-20 23:16:48 -05:00
Aidan C. Brady
84759daacd Fixed Metallurgic Infuser not switching to inactive state 2015-03-20 23:04:33 -05:00
Aidan C. Brady
81b5724c53 Self-merged Chemical Infuser fix 2015-03-20 22:54:48 -05:00
Aidan C. Brady
39621a74b1 Added config to display profiled portable tanks 2015-03-20 22:46:26 -05:00
David Vierra
30684d6aef Fix Metallurgic Infuser not auto-ejecting output 
Fixes #2268

(it was trying to auto-eject energy cells :P)

I checked all of the other TileComponentEjector instances for similar errors, the rest of them look okay.
 2015-03-20 14:16:23 -10:00
Aidan C. Brady
82c355cb86 Added a null check for transitions 2015-03-20 17:37:22 -05:00
Aidan C. Brady
37bc6a07c0 Flamethrowers now use gas 2015-03-20 17:34:11 -05:00
Aidan C. Brady
8173af50e0 Bump version to 8.0.1 - preparing to fix some bugs 2015-03-20 15:28:20 -04:00
Aidan C. Brady
e92f2654de API finalization, all set for release. 2015-03-20 14:18:18 -04:00
Aidan C. Brady
5206c6106e Use HTTPS for donator list download 2015-03-20 14:03:02 -04:00
Aidan C. Brady
2664e2e04c Perfected flamethrowers in SMP 2015-03-20 13:13:24 -04:00
Aidan C. Brady
5a35d54a5c Flamethrower networking fixes 2015-03-20 13:06:19 -04:00
Aidan C. Brady
caab819663 Fixed Fluid Gauge crash 2015-03-20 12:15:07 -04:00
Aidan C. Brady
6d85b0800f Fixed a Metallurgic Infuser container bug, hopefully fixed flamethrowers on SMP 2015-03-20 01:39:22 -04:00
Aidan C. Brady
8d83ada60f Fixed a Laser Amplifier & Laser Tractor Beam inventory crash, fixed missing sounds for Chargepad, Chemical Crystallzer, Chemical Washer & Metallurgic Infuser 2015-03-20 01:30:11 -04:00
Aidan C. Brady
c3ef938166 Implemented the SoundWrapper system again - for some reason dedicated servers won't behave without it on OS X 2015-03-19 23:16:27 -04:00
Aidan C. Brady
6bae353118 Fixed a transition crash 2015-03-19 20:41:18 -04:00
Aidan C. Brady
6276439c51 Fixed Charcoal Blocks and Refined Flowstone screwing up 2015-03-19 20:16:21 -04:00
Aidan C. Brady
eb7865b967 Eject config now should transition between versions. 2015-03-19 20:05:37 -04:00
Aidan C. Brady
b096202137 Hopefully finish off the migration of side configuration 2015-03-19 19:31:17 -04:00
Aidan C. Brady
6bea59ab5e Upgrades should now transition between v7 and v8 2015-03-19 18:57:09 -04:00
Aidan C. Brady
061c84d586 Even better factory transition 2015-03-19 18:53:02 -04:00
Aidan C. Brady
d3df5c5ce7 Attempt a fix at factory world transition 2015-03-19 18:12:06 -04:00
Aidan C. Brady
a1929b1918 Added recipe to turn brine into salt 2015-03-19 17:44:27 -04:00
Aidan C. Brady
a6e8fc8de0 Energy usage calculations are now much more efficient 2015-03-19 17:36:43 -04:00
Aidan C. Brady
763aef4fd0 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-19 17:22:45 -04:00
Aidan C. Brady
3b96fe4a4c Fixed Digital Miner, fixed energy upgrades not affecting usage of Chemical Washers/Electrolytic Separators/Chemical Infusers/Rotary Condensentrators, added "dump excess" to electrolytic separator 2015-03-19 17:22:31 -04:00
Ben Spiers
2a3ddd014b Remove FMLRenderAccessLibrary reference 2015-03-19 16:41:07 +00:00
Ben Spiers
b69e6a9d80 Make temperatures consistent. 2015-03-19 16:41:07 +00:00
Aidan C. Brady
9c6708660b Fixed Metallurgic Infuser tooltip 2015-03-19 09:28:50 -04:00
Aidan C. Brady
b51fbe79fd Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-19 08:54:06 -04:00
Aidan C. Brady
7bfaa738e3 Fixed teleporter crash 2015-03-19 08:53:43 -04:00
Ben Spiers
d560ea91a8 Move lighting config to general. 
Hopefully fixes whatever weird issue was going on before.
 2015-03-19 12:47:36 +00:00
Aidan C. Brady
7dec274a56 Fixed server-sided light value calls 2015-03-19 07:06:21 -04:00
Ben Spiers
35b3ec365f Fix a reactor controller serverside crash 2015-03-19 00:43:07 +00:00
Ben Spiers
b817b2840c Fix Generator Tiles' client/server sidedness 2015-03-19 00:36:29 +00:00
Ben Spiers
a90680eaae Fix sounds on the client-side of factories 2015-03-19 00:16:36 +00:00
Ben Spiers
efeeb06b77 Move rendering IDs to Common Proxy classes to appease ExtraUtils. 2015-03-18 21:39:01 +00:00
Ben Spiers
e36ecf9f05 Clean up and fix some stuff from the rebase pull. 2015-03-18 21:00:11 +00:00
Ben Spiers
a21e679a1d Make Lasers better at server-side 2015-03-18 20:52:58 +00:00
Ben Spiers
0307acc7eb Fix sounds on the server side. 2015-03-18 20:52:58 +00:00
Ben Spiers
eb5e8b0cca Make the reactor use Hohlraums properly 2015-03-18 20:47:31 +00:00
Aidan C. Brady
339e048a4e After much client code isolation, there should be no more issues on the server side with sounds 2015-03-18 13:26:12 -04:00
Aidan
12b6b4610b Merge pull request #2221 from halvors/development 
Cleanup, cleared some warnings.
 2015-03-18 08:55:37 -04:00
Halvor Lyche Strandvoll
97e51e0c26 Cleanup, cleared some warnings. 2015-03-18 13:51:14 +01:00
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
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 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
Aidan
c394c7c9bb Merge pull request #2186 from Archtikz/development 
Completely remade Seismic Reader.
 2015-03-11 10:59:31 -05:00
Aidan C. Brady
5e5975bc58 Work on new teleporter system - still a lot to do 2015-03-11 10:58:15 -05:00
Aidan C. Brady
605532adab Added frequency framework, should make creating frequency-based teleportation networks a breeze 2015-03-09 23:55:32 -05:00
Archtikz
1d4ff14013 Some more work on the Seismic Reader, tooltips and scaling changes 2015-03-09 22:10:15 +00:00
Aidan C. Brady
6ebf226db0 Make sure to save chunk changes 2015-03-09 15:38:18 -05:00
Aidan C. Brady
e3ca5ccecd Implemented the new systems in factories and chemical crystallizers, added better configurator mode switch tooltips 2015-03-08 18:55:56 -05:00
Aidan C. Brady
93df96851a Added remaining framework for gas/fluid tank handling, finished new configuration implementation for PRC and Chemical Injection Chamber 2015-03-08 18:24:21 -05:00
Archtikz
4f91277261 Completely remade Seismic Reader, may not be 100% efficient as it could 
be and I've bug tested as much as I can.
 2015-03-08 19:16:21 +00:00
Aidan C. Brady
18e23bb74c Better tooltips 2015-03-08 13:36:04 -05:00
Aidan C. Brady
8ce105d95f More configuration work 2015-03-08 13:27:34 -05:00
Aidan C. Brady
1f59f8ca1d Finished implementation of sided energy configuration. Yay! 2015-03-08 00:59:39 -06:00
Aidan C. Brady
e70650154d Added energy config readiness to all configurable machines, still yet to actually implement energy management 2015-03-07 23:55:22 -06:00
Aidan C. Brady
1bff3a93da Just about finished new Side Configuration GUI 2015-03-07 23:38:20 -05:00
Aidan C. Brady
28b209800a Quick fix for transporter color issue 2015-03-07 22:16:23 -05:00
Aidan C. Brady
78c3fe50ca Finished the separation of transporter and side configs 2015-03-07 22:11:10 -05:00
Aidan C. Brady
c84e13124a Work on configuration GUI 2015-03-07 21:19:59 -05:00
Aidan C. Brady
3f41027325 Started work on the new configuration interfaces, separated the transporter configuration from general side configuration, reorganized GUI elements into their own package 2015-03-07 21:08:28 -05:00
Aidan C. Brady
4085cb297d Fixed a few bugs with the new system 2015-03-07 19:22:54 -05:00
Aidan C. Brady
d4d7e88c4e Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration. 
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
 2015-03-07 19:09:23 -05:00
Aidan C. Brady
35518ad01f Fixed some tooltips, Hohlraum now properly accepts D-T fuel, added Hohlraum recipe, added lithium to EIM recipes 2015-03-06 07:50:09 -05:00
Aidan C. Brady
c1fc1c7cfb Added hohlraum, added D-T fuel recipe to Chemical Infuser, added a few missing tooltips 2015-03-05 22:53:07 -05:00
Aidan C. Brady
55ed9cd1f1 Fixed machines not saving state after being installed 2015-03-05 14:43:29 -05:00
Aidan C. Brady
ff91bf72fe Added new "machines" section to config - specifically enable or disable any core Mekanism machinery, including options to remove already-existing machinery from worlds 2015-03-05 13:48:01 -05:00
Aidan C. Brady
6d291c8bbc Fixed PRC energy usage 2015-03-05 09:07:40 -05:00
Aidan C. Brady
1237230637 Fixed PRC varying reaction time not being applied 2015-03-05 08:53:01 -05:00
Aidan C. Brady
abd581b2f1 Factory Installers are done! 2015-03-05 08:24:00 -05:00
Aidan C. Brady
274930fd8a Initial work complete for factory installers! Still need to add recipes and algorithm to transform generic machines into basic factories 2015-03-05 01:11:51 -05:00
Aidan C. Brady
6889bba52d Added the visuals tab. Easier than I thought! 2015-03-04 21:31:58 -05:00
Aidan C. Brady
f6a34f59bb Added another special character to filters 2015-03-04 21:04:23 -05:00
Aidan C. Brady
420a04c361 Added recipes for Induction Casing and Induction Ports, better recipes for Dynamic Tank blocks, fixed a few other recipe bugs 2015-03-04 20:54:03 -05:00
Aidan C. Brady
bb718de14b Induction Cell & Induction Provider recipes 2015-03-04 20:35:52 -05:00
Aidan C. Brady
6f0cf3a166 Fixed many bugs! 
- Asset issue with Dynamic Valve fixed
- Fixed pipes connecting to Dynamic Valves when not part of structure
- Fixed stack overflow when rendering valve fluids
- Fixed transmitter networks considering pull-based block connections as acceptor connections
- Fixed dynamic tanks maintaining a fluid type even when it has been depleted
- Fixed "clearIfNecessary()" transmitter calls not working
 2015-03-04 20:01:46 -05:00
Aidan C. Brady
09f1a04764 Doubled filter max string length from 12 characters to 24 characters, allows hyphens and spaces in filters, developed and integrated new fancy auto-scaling text renderer to prevent text overlap 2015-03-04 18:14:36 -05:00
Aidan C. Brady
7d17192173 Cardboard Box no longer picks up blocks that have -1 hardness values, also prevented Electric Chests from being vulnerable to explosives when locked 2015-03-04 17:31:52 -05:00
Aidan C. Brady
b2e532964c Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemAtomicDisassembler.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2015-03-04 14:30:05 -05:00
Aidan
0ae83150ab Merge pull request #2165 from Dannerick/myDev1 
New config entries
 2015-03-04 13:46:00 -05:00
Aidan C. Brady
df51d6f18f Fixed cables screwing up over chunk bounds 2015-03-04 13:39:25 -05:00
Aidan C. Brady
48b895b80a Fixed cables screwing up over chunk boundaries, fixed positioning of title text on certain machines, added a few tooltips to Induction Cells & Providers 2015-03-04 13:38:41 -05:00
Aidan C. Brady
af4c1c6cd7 A few fixes, need to fix an output issue 2015-03-04 13:04:32 -05:00
Aidan C. Brady
5747c9f904 Finished Matrix Statistics interface, need to figure out why induction cells aren't loading from NBT 2015-03-04 09:19:09 -05:00
Aidan C. Brady
90e8d407df Transmitter issue fixed, closes #2139 2015-03-04 00:12:01 -05:00
Aidan C. Brady
a0323f9334 A bit of work on the Matrix Stats GUI, hopefully completely fixed the transmitter issue 2015-03-04 00:11:09 -05:00
Aidan C. Brady
a18b42beee EIMs now properly store their energy in cells after destruction and extract energy from cells after creation 2015-03-03 18:36:10 -05:00
Aidan C. Brady
9260414177 Finished implementing Induction Matrix core functionality, just about everything works! Need to redesign GUI to include separate gauge for output rate 2015-03-03 18:18:32 -05:00
Aidan C. Brady
2ed43e5328 More work. @unpairedbracket, I wasn't able to get connected textures to work with my Induction Ports - would you mind taking a look at the code? 
The ports have an "output" and "input" mode with different textures, you can change the mode by shift-right clicking the port with a configurator. For some reason, no matter what I do, only the input texture is shown when I use the ctm system. For now I am using default block textures, but CTM textures are much preferred!
 2015-03-03 16:42:50 -05:00
Aidan C. Brady
13f36a52a6 Container refactoring 2015-03-03 14:02:03 -05:00
Aidan C. Brady
8d3dfc0c2c Work on EIM interface 2015-03-03 13:16:58 -05:00
Aidan C. Brady
562352d54c EIM work 2015-03-03 11:41:46 -05:00
Brian Lewis
4d8f43dbad Added atomic disassembler energy usage to config file [#2146] 2015-03-03 10:05:25 -06:00
Brian Lewis
112c1a1ba9 Add ethylene burn time as a config entry 2015-03-03 10:05:10 -06:00
Aidan C. Brady
7800447c99 Whoops 2015-03-03 00:18:50 -05:00
Aidan C. Brady
978e0801fa More work on EIM. Found some inconsistency/incomplete mechanics in the new multiblock system, no longer should be an issue 2015-03-03 00:15:18 -05:00
Aidan C. Brady
1c0fe96fed Energized Induction Matrix work! 2015-03-02 23:05:54 -05:00
Aidan C. Brady
63706900ba Hopefully fixed compile issue 2015-02-28 13:39:03 -06:00
Aidan C. Brady
ce31b1e22c Start work on the Energized Induction Matrix. This is going to be fun! 2015-02-28 13:08:17 -06:00
Aidan C. Brady
a5507a88f2 Yet again bump up energy production 2015-02-28 11:42:50 -06:00
Aidan C. Brady
4aa032717e Gave all Mekanism multiblocks the sparkle animation when formed, gave Fusion Reactor a big loud sound effect, also lowered the energy required to ignite the reactor yet again (may bump up before release) 2015-02-27 22:49:48 -06:00
Aidan C. Brady
24935dd51e Change that back - I need to get a better understanding for these underlying mechanics 2015-02-27 19:18:11 -06:00
Aidan C. Brady
410e298b8e Scaled up Universal Cable throughput in preparation for reactor output rate, may need to further scale in the future 2015-02-27 18:28:21 -06:00
Aidan C. Brady
b51aa0ee83 A few fixes, temporary x10 energy scale up to allow for higher energy production 2015-02-27 18:19:13 -06:00
Aidan C. Brady
439a734ce0 Fixed up Solar Neutron Activator NEI handler, better DT fuel texture 2015-02-27 14:06:38 -05:00
Aidan C. Brady
66c74c6643 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-02-27 13:42:46 -05:00
Aidan C. Brady
dd254ef326 Better NEI integration, fixed a major issue with the Chemical Washer recipe handler, finished off Solar Neutron Activator 2015-02-27 13:42:38 -05:00
Ben Spiers
f2859cacbb Rename EnergyUtils to UnitDisplayUtils 2015-02-27 17:33:14 +00:00
Ben Spiers
fa9588d557 Add a proper temperature display utility 2015-02-27 17:33:14 +00:00
Ben Spiers
743d80b516 Reduce energy input needed to ignite fusion by factor of 10 2015-02-27 17:33:14 +00:00
Aidan C. Brady
c4c2f97170 A few bug fixes 2015-02-27 10:09:28 -05:00
Aidan C. Brady
84ab0ecb3f Lasers now have fancy sound effects! 2015-02-27 01:57:54 -05:00
Aidan C. Brady
48c872ec37 Fixes 2015-02-27 00:47:08 -05:00
Aidan C. Brady
9c7831d07b Work on reactor interface a tad, work on Solar Neutron Activator 2015-02-27 00:28:46 -05:00
Aidan C. Brady
89de5ccea7 More fixes 2015-02-26 22:45:10 -05:00
Aidan C. Brady
341885b2ea Fixed some dropper bugs 2015-02-26 22:28:10 -05:00
Aidan C. Brady
183da4ef75 Finished droppers! 2015-02-26 21:09:04 -05:00
Aidan C. Brady
c39e3d1c1f More dropper work 2015-02-26 20:50:02 -05:00
Aidan C. Brady
49d0a7fc4b Work on droppers! Easiest way to get rid of leftover fluids and gasses in machine gauges. 2015-02-26 19:30:19 -05:00
Aidan C. Brady
7a1085d38d More work 2015-02-26 17:36:24 -05:00
Aidan C. Brady
5767bfb22e Work on Solar Neutron Activator and its recipe system 2015-02-26 17:23:53 -05:00
Aidan C. Brady
74ba02e0bb Polished off the upgrade system - now works consistently and properly for all Mekanism machines. Also, fixed a flamethrower bug 2015-02-26 16:47:36 -05:00
Aidan C. Brady
c7e199b06c Fixed Rotary Condensentrator upgrade inventory 2015-02-26 10:56:12 -05:00
Aidan C. Brady
999502a053 Half-implemented Solar Neutron Activator 2015-02-25 11:11:30 -05:00
Aidan C. Brady
a38090a521 Fixed flamethrower scaling 2015-02-25 10:13:22 -05:00
Aidan C. Brady
1675b9b1cf Flamethrowers now properly check collisions, these things are awesome 2015-02-25 10:02:04 -05:00
Aidan C. Brady
f5dadf443a Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
 2015-02-25 09:16:54 -05:00
Aidan C. Brady
bf42f71b8e Fixed a few crashes 2015-02-25 09:15:08 -05:00
Aidan C. Brady
701cdfd7bd Fixed a crash 2015-02-25 09:05:08 -05:00
Aidan C. Brady
3ba4c738a8 Item reorganization, lithium creation 2015-02-25 09:03:14 -05:00
Aidan C. Brady
955160ff45 Lithium! 2015-02-25 08:44:24 -05:00
Aidan C. Brady
cd25811f31 Fixed Solar Evaporation Controller recipe handler 2015-02-24 19:49:40 -05:00
Aidan C. Brady
62791baec7 Solar Evaporation Plant fixes 2015-02-24 14:11:26 -05:00
Aidan C. Brady
457d465165 Fix a few renames 2015-02-24 11:08:04 -05:00
Aidan C. Brady
888d1bdad8 Deuterium production is complete - use heavy water electrolysis instead of centrifuge recipe 2015-02-24 10:59:03 -05:00
Aidan C. Brady
29e50a34fa Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2015-02-24 10:42:55 -05:00
Aidan C. Brady
d2f941e630 Recipe fixes, fixed Portable Tank filling 2015-02-24 10:32:41 -05:00
Aidan C. Brady
d432fc979c Merge branch 'master' into development 2015-02-24 08:40:19 -05:00
Brian Lewis
8570748ad9 Fix for a gas-generator with empty tank throwing exception during onChunkLoad (bug #2148) 2015-02-23 10:14:10 -06:00
Aidan C. Brady
98d1a647cb Rename Salination Plant to Solar Evaporation Plant 2015-02-23 08:08:54 -05:00
Aidan
079ca960ee Merge pull request #2128 from chrixian/master 
Shift-click items to top (fill) slot
 2015-02-20 10:55:07 -05:00
Ben Spiers
dd404b4209 Let's try that again, shall we? Reimplement redstone checks to not load chunks. 2015-02-20 13:56:36 +00:00
Aidan C. Brady
be400ec648 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/client/nei/PRCRecipeHandler.java
 2015-02-19 18:37:09 -05:00
Aidan C. Brady
b1caa56f5a Fixed PRC gaseous NEI usage lookup 2015-02-19 18:36:08 -05:00
Aidan C. Brady
bf4b74f535 A few fixes 2015-02-19 17:17:28 -05:00
Aidan C. Brady
a9a506fe4a Merge branch 'master' into development 2015-02-19 16:53:15 -05:00
Aidan C. Brady
1e78cbf60e Fixed an impossible crash 2015-02-19 16:53:06 -05:00
Aidan C. Brady
3935fa74c1 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
 2015-02-19 16:38:23 -05:00
Aidan C. Brady
0310cc6f14 Cleanup 2015-02-19 16:37:28 -05:00
Aidan
0e50db9d1a Merge pull request #2140 from Dannerick/MyDev1 
Fix for setting generator output when ethylene already in tank when plac...
 2015-02-19 16:36:01 -05:00
Aidan C. Brady
ce29270d21 Merge branch 'master' into development 2015-02-19 16:35:09 -05:00
Aidan C. Brady
46f5a941ad Cleanup 2015-02-19 16:34:59 -05:00
Aidan
def3d6a729 Merge pull request #2141 from Dannerick/MyDev2 
[#2069] Fix for modded items being added to cardboardbox blacklist
 2015-02-19 16:34:00 -05:00
Aidan C. Brady
2fe4cf290d Merge branch 'master' into development (@unpairedbracket, make sure I did this right) 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/util/MekanismUtils.java
 2015-02-19 16:12:28 -05:00
Ben Spiers
17f9f88b34 Prevent Osmium Compressor and Combiner from using secondary energy upgrades. 
Also make them deterministic again to prevent them getting stuck
 2015-02-19 16:36:16 +00:00
Aidan C. Brady
cb377f88ab Fixed duplicate method 2015-02-19 09:15:56 -05:00
Aidan C. Brady
f67c048e78 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
 2015-02-19 09:15:30 -05:00
Aidan C. Brady
c59b64f7c9 Merged changes 2015-02-19 09:15:00 -05:00
Aidan C. Brady
0819c0ad5f Hopefully fixed the transmitter network halt issue. Provide feedback! 2015-02-19 09:13:03 -05:00
Aidan C. Brady
f7f4bd7243 Fixed Heat Generator burn time 2015-02-19 09:00:20 -05:00
Aidan C. Brady
b419519cc0 Chemical Infuser, Chemical Washer and Electrolytic Separator are now upgradeable 2015-02-18 19:33:03 -05:00
Brian Lewis
e842556c5b [#2069] Fix for modded items being added to cardboardbox blacklist 2015-02-18 17:30:09 -06:00
Brian Lewis
d41fec6031 Fix for setting generator output when ethylene already in tank when placed 2015-02-18 17:25:16 -06:00
Aidan C. Brady
f320aa4337 Merge branch 'master' into development 2015-02-17 21:35:01 -05:00
Aidan C. Brady
dcf7d7772a Fixed a transporter output bug 2015-02-17 21:34:36 -05:00
Aidan C. Brady
25df777b84 Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades 2015-02-17 21:27:35 -05:00
Aidan C. Brady
cb2e38ec61 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
 2015-02-16 18:13:03 -05:00
Aidan C. Brady
488af7e8ae Fixed facing updates not being sent out by machines 2015-02-16 18:12:31 -05:00
Aidan C. Brady
d33af99b87 More cleanup 2015-02-16 18:11:45 -05:00
Aidan C. Brady
548145ae02 Revert "Revert "Fix some transmitter issues."" 
This reverts commit e9ef6c1866.
 2015-02-16 17:24:51 -05:00
Aidan C. Brady
e9ef6c1866 Revert "Fix some transmitter issues." 
This reverts commit f63807c75a.
 2015-02-16 17:21:39 -05:00
Aidan C. Brady
03f6156d23 Minor cleanup 2015-02-16 17:20:51 -05:00
Aidan C. Brady
3561f9fe59 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2015-02-16 14:40:10 -05:00
Aidan
b885742690 Merge pull request #2001 from Dannerick/master 
Fix for #1997 gasGenerators incorrectly limiting output
 2015-02-16 14:32:52 -05:00
Ben Spiers
0cef749249 Actually increment the Mod classes' versions 2015-02-13 14:40:14 +00:00
Christian Ehrhardt
db4adce2a8 Shift-click items to top (fill) slot 2015-02-12 19:18:16 -06:00
Aidan C. Brady
2796a5d67b Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
 2015-02-12 13:10:55 -05:00
Ben Spiers
7e08643ebd ConcurrentHashMaps don't like null keys 2015-02-12 16:59:39 +00:00
Ben Spiers
122f4190bd Remove some bad/unneeded imports 2015-02-12 16:42:25 +00:00
Ben Spiers
e6a4d3efb2 Screw it, let's just make these concurrent. 
Keeping transmitters as a synchronizedSet-wrapped LinkedHashSet for now, because there isn't a ConcurrentLinkedHashSet.
 2015-02-12 16:39:48 +00:00
Aidan C. Brady
0612712abe Fixed energy cubes not outputting items 2015-02-11 08:43:32 -05:00
Aidan C. Brady
81c948f28d Fixed capes 2015-02-11 08:36:52 -05:00
Aidan C. Brady
086dd83a57 Fixed capes 2015-02-11 08:36:40 -05:00
Aidan C. Brady
50f7df5f98 Merge branch 'development' into v8 
Conflicts:
	build.properties
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/recipe/RecipeHandler.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2015-02-10 18:39:15 -05:00
Aidan C. Brady
d8e12ca8d2 Merge branch 'development' into v8 
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2015-02-10 11:38:13 -05:00
Ben Spiers
3e38ac37f4 This feature request has been more trouble than it's worth. 2015-01-19 12:16:04 +00:00
Ben Spiers
2ced2e3860 Fix the bad implementation of the ambient lighting toggle 2015-01-19 12:07:54 +00:00
Ben Spiers
1f9185dd01 Make the gas mask and jetpack maps synchronized 2015-01-10 18:17:17 +00:00
Ben Spiers
89be8b4482 Fix using localised names for overlay textures. 2015-01-10 17:47:16 +00:00
Ben Spiers
b8b49db104 It seems the Heat Transfer equations I'm using are a bit stiff. 
Adjust some paramaters some to improve how well we deal with this.
 2015-01-09 02:50:18 +00:00
Ben Spiers
385a1d29f6 Make a start on the boiler. 
It's currently causing odd issues with the heat simulator and has various issues such as balance not existing yet.
Also improve the specification of a load of the multiblock generics to reduce needless casting.
 2015-01-08 05:26:53 +00:00
Ben Spiers
c0db6b7eb5 Fix #2075, hopefully. 2015-01-07 23:58:23 +00:00
Ben Spiers
41cf1a2437 Move a bunch of registrations to PreInit. 
I believe they should be happening there in the first place.
 2015-01-07 23:13:45 +00:00
Ben Spiers
4b75a2f6a2 Hopefully improve the synchronization of the networks' transmitter sets 2015-01-07 23:13:10 +00:00
Ben Spiers
fdde129180 Obfuscate password entry 2014-12-28 23:01:26 +00:00
Ben Spiers
3d4636d8da Config option for generator lighting 2014-12-27 21:37:20 +00:00
Ben Spiers
f419c4e6d5 Fix anvil and snow pickup 2014-12-27 21:26:20 +00:00
Ben Spiers
aea27f3bd6 Merge pull request #2029 from SoraZodia/master 
@Interface removal for IPipeTile
 2014-12-27 21:17:42 +00:00
Ben Spiers
f63807c75a Fix some transmitter issues. 2014-12-27 21:09:34 +00:00
Ben Spiers
ccf7a37b22 Make HeatUtils not take unnecessary arguments. 2014-12-27 21:08:18 +00:00
Ben Spiers
d4f48401d3 Merge branch 'development' into v8 2014-12-22 23:46:17 +00:00
Ben Spiers
c77e84ca6c Make cyan brighter 2014-12-22 23:41:33 +00:00
Ben Spiers
fe2c22862a Fill in some machines' type arguments. 2014-12-22 23:40:51 +00:00
Ben Spiers
00fa5ccbe6 Make the heat methods not crash. 2014-12-22 23:40:29 +00:00
Ben Spiers
37e35d5943 Make loading the reactor from file update the "last" temperatures. 2014-12-22 23:40:03 +00:00
Ben Spiers
f3d9faff6b Make it dangerous to be in the reactor while it is at >100million degrees, and full of burning plasma. 2014-12-22 23:38:32 +00:00
Ben Spiers
bc1ef33cd6 Make unforming the fusion reactor stop the burn. 2014-12-22 23:36:37 +00:00
Ben Spiers
7296c3dbcb Reactors now a Heat source. Awaiting Balance. 2014-12-22 21:30:45 +00:00
Ben Spiers
3544addf20 Make heat generator not lose energy when below ambient temperature, and use the Carnot Engine equations for efficiency. 2014-12-22 20:10:01 +00:00
Ben Spiers
8a4aaff44a Move standard simulation method into a Utils class. 2014-12-22 19:38:03 +00:00
Ben Spiers
ab2a7cb6c7 Improve temperature colours to allow for different base colours. 
Make a start on insulation.
Code the characteristics of air into static IHeatTransfer variables.
 2014-12-22 19:14:55 +00:00
Ben Spiers
7214a88a7a Make network reader not use energy when in creative mode. 2014-12-20 02:09:55 +00:00
Ben Spiers
4a404dfc78 Improve Heat mechanic, and get it rendering nicely. 
Colour temperature algorithm adapted from http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/ - thanks to Tanner Hellan for the useful post.
 2014-12-20 02:09:14 +00:00
Ben Spiers
2bd2e94c7b Heat Generator changed to use the new heat mechanic. Not balanced or anything yet, more a proof of concept. 2014-12-19 04:49:15 +00:00
Ben Spiers
bb937fdd53 Heat Transmission. 2014-12-19 04:46:23 +00:00
Ben Spiers
b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +00:00
Ben Spiers
5dc0e5dca1 Merge branch 'development' into v8 2014-12-18 23:01:31 +00:00
Ben Spiers
6aa84d1388 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityPortableTank.java
 2014-12-18 22:56:26 +00:00
Ben Spiers
1ce56d09e2 Fix Portable Tank NPE 2014-12-18 22:53:24 +00:00
Ben Spiers
fd0bdd4da8 Efficiency of isValidAcceptor methods. 2014-12-18 22:52:45 +00:00
Brian Lewis
b95836e6be Merge remote-tracking branch 'upstream/master' 2014-12-18 08:50:53 -06:00
Ben Spiers
b5e289b504 Merge branch 'development' into v8 2014-12-16 20:35:55 +00:00
Ben Spiers
6e422151be Merge branch 'master' into development 2014-12-16 20:34:55 +00:00
Ben Spiers
9a6b3c511e Fix a silly mistake 2014-12-16 20:33:23 +00:00
Ben Spiers
d181dd9fd6 Oops. 2014-12-16 01:16:09 +00:00
Ben Spiers
40590f7a33 Merge branch 'development' into v8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
 2014-12-15 17:34:24 +00:00
Ben Spiers
add14395e4 Merge branch 'master' into development 2014-12-15 17:29:45 +00:00
Ben Spiers
e14501f3b5 Add RedstoneControl to Electric Pump. 2014-12-15 17:28:57 +00:00
Ben Spiers
e51307d68f Fix merge 2014-12-15 17:20:13 +00:00
SoraZodia
14a7383e6a @Interface removal for IPipeTile 
It was causing an NoClassDefFoundError

In case you need proof, here's the crash log:
http://pastebin.com/9unZd9LG
 2014-12-15 00:00:23 -10:00
Ben Spiers
9a47f800f9 Merge branch 'development' into v8 
Conflicts:
	src/main/java/mekanism/client/ClientProxy.java
 2014-12-15 00:05:39 +00:00
Ben Spiers
7ebcba8528 Merge branch 'master' into development 2014-12-15 00:03:08 +00:00
Ben Spiers
ee585c05dc Make glowing plastic blocks glow. 2014-12-15 00:02:22 +00:00
Ben Spiers
49be30de34 Merge branch 'development' into v8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/util/MekanismUtils.java
 2014-12-14 19:04:03 +00:00
Ben Spiers
a64cd69535 Merge branch 'master' into development 2014-12-14 18:17:36 +00:00
Ben Spiers
a91dcc49d4 Introduce statistical consumption of gases. 2014-12-14 18:10:46 +00:00
Ben Spiers
123ed6c6c5 Merge branch 'master' into development 2014-12-14 01:54:49 +00:00
Ben Spiers
e98026d78d Fix paxels 2014-12-14 01:53:26 +00:00
Brian Lewis
681d7e9963 Removed commented out test line 2014-11-28 12:20:29 -06:00
Brian Lewis
15b6f7e70c Fix for #1997 - gasGenerators now correctly limit output based on fuel type burned 2014-11-28 12:13:34 -06:00
Aidan C. Brady
a94b9a227d Digital Miner delay is now persistent 2014-11-21 08:23:56 -05:00
Aidan C. Brady
db5c2c3d2c Added IToolHammer support 2014-11-21 08:17:47 -05:00
Aidan C. Brady
ec5793dc4d Fixed typo, fixed coloring of fluids in Dynamic Tank, Portable Tank & Mechanical Pipes 2014-11-21 08:13:38 -05:00
Ben Spiers
ce390ae426 Reorganise trait registration 2014-11-17 22:48:46 +00:00
Ben Spiers
0a0f67ee81 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:48:46 +00:00
Ben Spiers
791ed60bb0 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
 2014-11-17 22:47:08 +00:00
Ben Spiers
5749ed4d2a Merge branch 'master' into development 2014-11-17 22:41:15 +00:00
Ben Spiers
1f2dd3162a Reorganise trait registration 2014-11-17 22:40:38 +00:00
Ben Spiers
1a8e2326b9 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:40:18 +00:00
Ben Spiers
19fa918daa Merge branch 'development' into 1.8 2014-11-16 23:59:33 +00:00
Ben Spiers
7ab1e66d6a Merge branch 'master' into development 2014-11-16 23:58:55 +00:00
Ben Spiers
11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Aidan C. Brady
a699a4b860 Merge branch 'master' into development 2014-11-16 11:45:13 -05:00
Aidan C. Brady
de5cc8c76d Merge fix changes 2014-11-16 11:45:05 -05:00