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

3002 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Halvor Lyche Strandvoll
87bbf22a8b Ignores Minecraft Forge files in .gitignore. 2015-03-19 08:59:12 +01:00
Ben Spiers
35b3ec365f Fix a reactor controller serverside crash 2015-03-19 00:43:07 +00:00
Ben Spiers
b817b2840c Fix Generator Tiles' client/server sidedness 2015-03-19 00:36:29 +00:00
Ben Spiers
a90680eaae Fix sounds on the client-side of factories 2015-03-19 00:16:36 +00:00
Ben Spiers
efeeb06b77 Move rendering IDs to Common Proxy classes to appease ExtraUtils. 2015-03-18 21:39:01 +00:00
Ben Spiers
e36ecf9f05 Clean up and fix some stuff from the rebase pull. 2015-03-18 21:00:11 +00:00
Ben Spiers
a21e679a1d Make Lasers better at server-side 2015-03-18 20:52:58 +00:00
Ben Spiers
0307acc7eb Fix sounds on the server side. 2015-03-18 20:52:58 +00:00
Ben Spiers
eb5e8b0cca Make the reactor use Hohlraums properly 2015-03-18 20:47:31 +00:00
Aidan C. Brady
143777ae6e Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-18 14:32:00 -04:00
Aidan C. Brady
339e048a4e After much client code isolation, there should be no more issues on the server side with sounds 2015-03-18 13:26:12 -04:00
Aidan
78cb22e27e Merge pull request #2222 from Adaptivity/development 
Update ru_RU.lang
 2015-03-18 12:46:30 -04:00
Anton
c02724d40f Update ru_RU.lang 2015-03-18 18:03:29 +03:00
Aidan
12b6b4610b Merge pull request #2221 from halvors/development 
Cleanup, cleared some warnings.
 2015-03-18 08:55:37 -04:00
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