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
Mr-tanaka3
739e8f95e3
Update ja_jp.lang
2015-03-20 10:42:32 +09: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
cef1f02569
Build script cleanup
2015-03-19 17:55:22 -04:00
Aidan
b614a530d9
Merge pull request #2237 from halvors/codechickcencorefix
...
Added CodeChickenCore as dependency for development enviroments.
2015-03-19 17:53:53 -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
Halvor Lyche Strandvoll
5dd4fe9029
Added CodeChickenCore as dependency for development enviroments.
2015-03-19 14:49:41 +01: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
Aidan
74009de13b
Merge pull request #2233 from halvors/ignoreforge
...
Ignores Minecraft Forge files in .gitignore.
2015-03-19 07:03:10 -04:00
