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 |
|
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 |
|
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 |
|
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 |
|
Aidan
|
9818f2fc85
|
Merge pull request #1974 from Mazdallier/patch-1
Update fr_FR.lang
|
2014-11-17 10:40:07 -05: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 |
|
Ben Spiers
|
11fac12840
|
Should fix #1762.
|
2014-11-16 23:58:12 +00:00 |
|
Aidan C. Brady
|
a699a4b860
|
Merge branch 'master' into development
|
2014-11-16 11:45:13 -05:00 |
|
Aidan C. Brady
|
e54edcf4cf
|
Another fix attempt
|
2014-11-16 11:43:08 -05:00 |
|
Aidan C. Brady
|
ebb23fbfea
|
Merge branch 'master' into development
|
2014-11-16 01:06:44 -05:00 |
|
Aidan C. Brady
|
5be57a20d6
|
Attempt a fix at an API bug
|
2014-11-16 01:06:00 -05:00 |
|
Aidan C. Brady
|
d4ee103839
|
Merge branch 'master' into development
|
2014-11-15 18:20:40 -05:00 |
|
Aidan
|
64dba94ea8
|
Merge pull request #1958 from fewizz/patch-3
Update ru_RU.lang
|
2014-11-15 18:06:07 -05:00 |
|
Aidan
|
d2030a74e3
|
Merge pull request #1963 from Mazdallier/patch-2
Update fr_FR.lang
|
2014-11-15 18:05:54 -05:00 |
|
Yves
|
30cf159afd
|
Update fr_FR.lang
|
2014-11-12 09:59:33 +01:00 |
|
fewizz
|
7f38006c7f
|
Update ru_RU.lang
|
2014-11-11 17:44:52 +04:00 |
|
Ben Spiers
|
64d0f8a5cc
|
Merge branch 'master' into development
|
2014-11-11 12:52:27 +00:00 |
|
Ben Spiers
|
3a805bd948
|
Fix me being stupid. #1943
|
2014-11-11 12:51:28 +00:00 |
|
Ben Spiers
|
a0c492862f
|
Merge branch 'master' into development
Conflicts:
src/main/java/mekanism/common/multipart/ItemGlowPanel.java
|
2014-11-11 12:37:57 +00:00 |
|
Ben Spiers
|
8f6b24ba67
|
Stop UniCables claiming to carry MJ
|
2014-11-11 12:27:03 +00:00 |
|