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
283053dab9
Fix a texture (rgb profile?) issue
2015-03-21 21:43:44 +00: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
Aidan C. Brady
123199a689
Merge branch 'master' into development
2015-03-20 20:29:04 -05:00
Aidan
7c7007e2c4
Merge pull request #2270 from Mr-tanaka3/master
...
Update ja_JP.lang
2015-03-20 20:27:27 -05:00
Aidan
1730b4db17
Merge pull request #2269 from codewarrior0/patch-1
...
Fix Metallurgic Infuser not auto-ejecting output
2015-03-20 20:27:19 -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
1914c1cdfc
Merge pull request #2252 from halvors/translation
...
Added Norwegian translation
2015-03-20 10:37:57 -04:00
Halvor Lyche Strandvoll
4beea9481a
Added no_NO.lang
2015-03-20 15:35:04 +01:00
Aidan
fe80ecb190
Merge pull request #2251 from Adaptivity/development
...
Update ru_RU.lang
2015-03-20 10:18:23 -04:00
Anton
5635a72745
Update ru_RU.lang
2015-03-20 16:28:39 +03:00
Aidan
c474500416
Merge pull request #2250 from Vexatos/patch-6
...
Re-added comments to de_DE.lang
2015-03-20 08:43:55 -04:00
Vexatos
85fe0fa129
Update de_DE.lang
2015-03-20 13:43:28 +01:00
Vexatos
2d9e094c85
Re-added comments to de_DE.lang
2015-03-20 13:39:35 +01:00
Aidan
96a6922568
Merge pull request #2247 from Vexatos/patch-5
...
Update de_DE.lang
2015-03-20 02:00:14 -04:00
Vexatos
46f013c35b
Update de_DE.lang
...
Comments will come back later today. I was in a hurry
2015-03-20 06:57:54 +01: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
857954575a
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2015-03-20 01:30:17 -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
97d8eebc6c
Merge pull request #2246 from Mrkwtkr/patch-1
...
Update zh_CN.lang
2015-03-20 01:16:04 -04:00
Mrkwtkr
f03c9bd03a
Update zh_CN.lang
2015-03-20 13:10:13 +08: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
