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
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
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
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
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
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
Ben Spiers
0d21d201a9
Only receive RF from sides in NORMAL mode.
2014-11-11 12:25:58 +00:00
Ben Spiers
92f1579bba
Make PULL mode actually, and exclusively, pull.
2014-11-11 12:25:10 +00:00
Ben Spiers
5b4f154040
Giant optimise imports.
2014-11-10 21:53:29 +00:00
Ben Spiers
4d1c1285b2
Update lots of APIs, most notably BC and an actual 1.7 version of CC
2014-11-10 21:51:37 +00:00
Aidan Brady
1b665d99e2
Fixed a Portable Tank crash
2014-10-26 15:19:00 -04:00
Aidan C. Brady
10107678d1
Fixed strange glow panel issue
2014-10-17 12:03:42 -04:00
Ben Spiers
92a5929c28
That was not a statement.
2014-10-02 22:16:29 +01:00
Ben Spiers
4f41f5a1df
Prevent IC2 double-outputting.
2014-10-02 18:54:30 +01:00
Ben Spiers
f0b7f342b8
ElectricBlocks now output to IC2 properly.
2014-10-02 18:54:30 +01:00
Ben Spiers
3c715d906b
Shuffle up EnergyNet support a bit.
...
Remove the ENet's TileEntity instead of the world's one, and remove the existing one if one exists when adding the current one. Also move registration to on first tick to hopefully avoid adding too early issues. This is when IC2's delegates register so should be relatively foolproof.
Conflicts:
src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
2014-10-02 18:54:30 +01:00
Ben Spiers
b25d8f673b
Only use the EnergyNet-related interfaces if IC2 itself is loaded.
...
Also add some extra safety to useIC2().
Conflicts:
src/main/java/mekanism/common/util/MekanismUtils.java
2014-10-02 18:54:30 +01:00
Aidan
26dadfe176
Merge pull request #1876 from sk89q/oredictcache-fix
...
Fix some performance issues with OreDictCache
2014-10-02 11:16:47 -04:00
TheJulianJES
ea42e52973
Fix > 3D Bow Bug
2014-10-01 17:30:32 +02:00
sk89q
16fc882da7
Change OreDictCache to hit the hash map one fewer time.
2014-09-30 13:26:34 -07:00
Ben Spiers
5d08726880
Add config options to blacklist the different power systems.
...
This should help people avoid IC2 problems with console spam, but such a "solution" only relieves the most obvious symptom of chunk-thrashing, it doesn't stop the thrashing itself.
2014-09-30 20:40:18 +01:00
Ben Spiers
e7f3204ed7
Fix a tesseract fluid issue.
2014-09-30 20:24:04 +01:00
jmongeon
5011ea1c70
Add comparator support to the GasTank ( #1829 ).
2014-09-26 20:35:43 -04:00