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
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
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
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
992e0aebf3
Merge branch 'development' into v8
2014-12-14 19:07:46 +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
ef83acd73c
Merge branch 'development' into v8
...
Conflicts:
src/main/java/mekanism/tools/common/MekanismTools.java
2014-12-14 01:56:53 +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
Aidan
8690d36820
Merge pull request #2010 from Riku17777/patch-2
...
Update ja_JP.lang
2014-12-02 10:43:57 -05:00
Riku1777
350ad872e5
Update ja_JP.lang
...
miss Fixed and translate added
2014-12-02 13:34:00 +09:00
Aidan
8d7623aa65
Merge pull request #2007 from Riku17777/patch-1
...
Update ja_JP.lang
2014-12-01 17:43:59 -05:00
Aidan
c31c09b907
Merge pull request #2006 from Mazdallier/patch-1
...
Update fr_FR.lang
2014-12-01 17:43:53 -05:00
Riku1777
d03c419035
Update ja_JP.lang
...
I'am japanese.
JP Translate edited
hey
2014-12-02 04:07:58 +09:00
Yves
3001756562
Update fr_FR.lang
2014-12-01 09:02:36 +01:00
Aidan
07827ce356
Merge pull request #1989 from Mr-tanaka3/master
...
Create ja_JP.lang
2014-11-23 13:48:36 -05:00
Mr-tanaka3
8770486d6e
Update ja_JP.lang
2014-11-23 16:45:18 +09:00
Mr-tanaka3
82d8a4f39c
Create ja_JP.lang
2014-11-23 16:36:49 +09:00
Aidan C. Brady
a94b9a227d
Digital Miner delay is now persistent
2014-11-21 08:23:56 -05:00
