Commit Graph
717 Commits
Author SHA1 Message Date
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
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