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

833 commits

Author SHA1 Message Date
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 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
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 d1990c232d Finished off Oredictionificator 2015-03-16 11:43:28 -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 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 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
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
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 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 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 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 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
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 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
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 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 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 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
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
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 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 1f9185dd01 Make the gas mask and jetpack maps synchronized 2015-01-10 18:17:17 +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 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 fe2c22862a Fill in some machines' type arguments. 2014-12-22 23:40:51 +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 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
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
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
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
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