Commit Graph
641 Commits
Author SHA1 Message Date
Aidan C. Brady b1ebcd0e5e Merged! 2015-02-10 11:33:28 -05:00
Aidan 6d5ea1f184 Merge pull request #2112 from Sakarias-Longhorn/patch-1
Update fr_FR.lang
2015-02-08 16:25:57 -05:00
Aidan 4ffd064c06 Merge pull request #2073 from Adaptivity/patch-4
Update ru_RU.lang
2015-02-08 16:25:45 -05:00
Aidan 021f7a1bb7 Merge pull request #2062 from BrunoLG/patch-7
Update pt_BR.lang
2015-02-08 16:25:40 -05:00
Sakarias Longhorn cde1ab3967 Update fr_FR.lang 2015-01-29 17:24:43 +01:00
Al a2d79d5ca5 Update pt_BR.lang
Fixed: "Paxel"

Minecraft vanilla:
item.leggingsCloth.name=Leather Pants
item.leggingsCloth.name=Calça de Couro (pt_BR)
2015-01-21 09:37:08 -03: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 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
Anton 36d3d1bdb2 Update ru_RU.lang 2015-01-05 18:22:34 +03: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
BrunoLG 7a69f96ae2 Update pt_BR.lang 2014-12-27 13:16:14 -02:00
Ben Spiers c77e84ca6c Make cyan brighter 2014-12-22 23:41:33 +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 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 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
SoraZodia 14a7383e6a @Interface removal for IPipeTile
It was causing an NoClassDefFoundError

In case you need proof, here's the crash log:
http://pastebin.com/9unZd9LG
2014-12-15 00:00:23 -10: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 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 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
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
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
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
Ben Spiers 85e93bbdbb Merge branch 'master' into development 2014-11-17 22:49:11 +00:00
Ben Spiers ce390ae426 Reorganise trait registration 2014-11-17 22:48:46 +00:00
Ben Spiers 0a0f67ee81 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:48:46 +00:00
Ben Spiers 5749ed4d2a Merge branch 'master' into development 2014-11-17 22:41:15 +00:00
Ben Spiers 1f2dd3162a Reorganise trait registration 2014-11-17 22:40:38 +00:00
Ben Spiers 1a8e2326b9 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:40:18 +00:00
Yves 05fa56e87f Update fr_FR.lang 2014-11-17 16:31:07 +01:00
Ben Spiers 7ab1e66d6a Merge branch 'master' into development 2014-11-16 23:58:55 +00:00