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 |
|
Brian Lewis
|
b95836e6be
|
Merge remote-tracking branch 'upstream/master'
|
2014-12-18 08:50:53 -06:00 |
|
Ben Spiers
|
b5e289b504
|
Merge branch 'development' into v8
|
2014-12-16 20:35:55 +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
|
40590f7a33
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
|
2014-12-15 17:34:24 +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 |
|
Ben Spiers
|
e51307d68f
|
Fix merge
|
2014-12-15 17:20:13 +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
|
9a47f800f9
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/client/ClientProxy.java
|
2014-12-15 00:05:39 +00: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
|
992e0aebf3
|
Merge branch 'development' into v8
|
2014-12-14 19:07:46 +00:00 |
|
Ben Spiers
|
49be30de34
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/util/MekanismUtils.java
|
2014-12-14 19:04:03 +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
|
ef83acd73c
|
Merge branch 'development' into v8
Conflicts:
src/main/java/mekanism/tools/common/MekanismTools.java
|
2014-12-14 01:56:53 +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 |
|
Brian Lewis
|
681d7e9963
|
Removed commented out test line
|
2014-11-28 12:20:29 -06:00 |
|
Brian Lewis
|
15b6f7e70c
|
Fix for #1997 - gasGenerators now correctly limit output based on fuel type burned
|
2014-11-28 12:13:34 -06: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 |
|
Aidan C. Brady
|
a94b9a227d
|
Digital Miner delay is now persistent
|
2014-11-21 08:23:56 -05:00 |
|
Aidan C. Brady
|
db5c2c3d2c
|
Added IToolHammer support
|
2014-11-21 08:17:47 -05:00 |
|
Aidan C. Brady
|
ec5793dc4d
|
Fixed typo, fixed coloring of fluids in Dynamic Tank, Portable Tank & Mechanical Pipes
|
2014-11-21 08:13:38 -05:00 |
|
Ben Spiers
|
6308bf7e2f
|
Merge branch 'development' into 1.8
|
2014-11-17 22:49:39 +00: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
|
791ed60bb0
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/common/multipart/MultipartMekanism.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
|
2014-11-17 22:47:08 +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
|
19fa918daa
|
Merge branch 'development' into 1.8
|
2014-11-16 23:59:33 +00: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 |
|