Aidan
09e8e9aed7
Merge pull request #4801 from thiakil/wrench-compat
...
Wrench compat
2017-11-16 12:11:48 -05:00
Aidan
801676b965
Merge pull request #4803 from thiakil/api-update
...
Api update
2017-11-16 12:10:57 -05:00
Aidan
423cf7b44a
Merge pull request #4804 from thiakil/nonnull-network
...
Nonnull network data
2017-11-16 12:09:53 -05:00
Aidan
bed953f0f0
Merge branch '1.12' into nonnull-network
2017-11-16 12:09:46 -05:00
Xander
12a87b798a
Missed GasTankInfo interface in commit
9.4.1+8bbef954
2017-11-11 12:09:13 +08:00
Xander Victory
8bbef9544c
add default method to gas interface to maintain binary compat
2017-11-10 15:28:14 +08:00
Xander Victory
7fa325bc03
add The One Probe provider for gas tanks
2017-11-10 15:24:20 +08:00
Xander Victory
a86539f1a0
add gas handler methods for retrieving the tank infos regardless of side.
2017-11-10 15:23:48 +08:00
Xander Victory
80548e39d9
tidy gradle deps, so that apis are compileonly
2017-11-10 15:16:30 +08:00
Xander Victory
07415eabe2
null fluid handler
2017-11-10 12:12:13 +08:00
Xander Victory
946ba5c48a
readonly null side item handler for container blocks (mainly TOP/WALWA)
2017-11-10 11:37:08 +08:00
Xander
6f2aec2d0b
dont render jetpack/suba tank levels if gui hidden
2017-11-09 21:58:51 +08:00
Xander Victory
cbe9cdc3f2
implement tinted ore gasses, fix GuiGauge to render the tinted gas
2017-11-09 12:08:41 +08:00
Xander
2f8f71862c
localise normal/push/pull/none mode on sided pipes (incl Italian translation)
2017-11-08 21:58:25 +08:00
Xander
58c80cf150
fix localisation of colours in configurator mode changing
2017-11-08 21:58:25 +08:00
Xander
f46bbb0635
fix silk touch logic that causes the drops to be eaten when the block wont drop anything unless silked
2017-11-08 21:58:25 +08:00
Xander
f4b4cede0b
fix silk param to event firing
2017-11-08 21:58:25 +08:00
Xander
74decf0b6c
call the fallback silk touch function on exception
2017-11-08 21:58:24 +08:00
Xander
32af79f8f6
fix digital miner meta & avoid creating an itemstack for each filter
2017-11-08 21:58:24 +08:00
Xander
234bf2307a
Merge pull request #4767 from alexpic57/1.12
...
fix for aidancbrady/Mekanism#3805 and #4763
2017-11-08 19:08:33 +08:00
Xander Victory
532744f598
basic tint support for gasses
2017-11-08 16:59:45 +08:00
Xander Victory
8a9f63470d
fix tinted fluidstack start/end rendering in Mech Pipe and query fluid colour correctly in normal rendering
2017-11-08 16:32:22 +08:00
Xander Victory
fdbeef9cb2
change late sprite getting to try the registered icon name
2017-11-08 15:30:53 +08:00
Xander Victory
36ad9e7f69
refactor one shot TileNetworkList creation to use helper method
2017-11-08 15:16:09 +08:00
Xander Victory
2411a1be4d
change ArrayList<Object> to a non null list implementation for network data
2017-11-08 15:08:51 +08:00
Xander Victory
2d9a02b29e
null safety for silly mods that somehow register gasses after the texture stitch
2017-11-08 11:49:03 +08:00
Xander Victory
9d70d06454
check loader state instead of relying on boolean
2017-11-08 11:49:02 +08:00
Xander Victory
08a13cff4f
check init phase in recipe handler
2017-11-08 11:49:01 +08:00
Xander Victory
f4bbb5b35c
Ensure gasses are registered in preinit or init (prevent textures not being set)
2017-11-08 11:49:00 +08:00
Xander Victory
64b2e421f7
add recipe adding methods to the API, and a handler to get the internal class.
2017-11-08 11:48:59 +08:00
Xander Victory
26a28c13db
add (String, ResourceLocation) constructor to Gas
2017-11-08 11:48:58 +08:00
Xander Victory
643a9dc03a
Attempt to only deregister IC2 once. Updates are queued, and IC2 doesn't check that a duplicate removal change is queued. Should fix #4789
2017-11-07 17:17:38 +08:00
Xander Victory
94428beddc
cap fusion reactor injection rate, should eliminate CC/OC & hacked packet exploits. Fixes #4792
2017-11-07 16:48:59 +08:00
Xander Victory
f6f7678f8b
add generic wrench handling to fully transparently support BC & COFH wrenches, and add a bonus IC2 wrench support.
2017-11-07 15:38:54 +08:00
Xander Victory
d73796ad4d
add IToolHammer (cofh) to Configurator
2017-11-07 13:24:26 +08:00
alexpic57
9a20f3833a
fix for aidancbrady/Mekanism#4763
2017-10-27 19:11:02 +02:00
alexpic57
5e67c7a160
fix for aidancbrady/Mekanism#3805
2017-10-13 13:42:40 +02:00
Tom Elfring
837e2f7f30
Disable stacking empty FluidTanks
2017-10-12 18:54:55 +02:00
Tom Elfring
788083d1de
Add Polish translation nuggets - @EliogabalusPL
2017-10-10 19:51:21 +02:00
Tom Elfring
c897d0840e
Fix derp, add missing ","
2017-10-10 19:32:20 +02:00
Tom Elfring
5f43d1e029
Update Polish translations - @EliogabalusPL
2017-10-10 19:18:17 +02:00
Tom Elfring
557f155690
Fix wrong merge conflict MekanismJEI
2017-10-10 19:17:01 +02:00
aidancbrady
bcd5fd5bbb
Use HTTP for thiakil’s maven, fix merge
2017-10-09 14:42:14 -04:00
Aidan
77d3b974d6
Merge pull request #4733 from josephcsible/combiner
...
Fix #4648 : Let the combiner combine with things other than cobblestone
2017-10-09 14:15:00 -04:00
Aidan
d96eb27572
Merge branch '1.12' into combiner
2017-10-09 14:14:34 -04:00
Aidan
15a7b0350b
Merge pull request #4752 from thommy101/feature/4694
...
Added subtype check to transporter finder
2017-10-09 14:11:06 -04:00
Tom Elfring
e27c51be97
Prevent item duplication with Robit item pickup
...
What is dead my never be picked up
Fixes #4715
2017-10-08 17:16:54 +02:00
Tom Elfring
6ea5c00579
Split R.Condensentrator in 2 JEI categories
...
It now has two categories registered to the machine, one for decondensentrating and one for condensentrating.
Changed the JEI tooltip from machine name to what the recipe is actual doing.
Fixes #4751
2017-10-08 16:58:46 +02:00
Tom E
bec37bfbe2
Add tooltip information to Seismic Reader
...
Added some information about usage to the Seismic Reader, almost the same as the Seismic Vibrator.
Adds feature #4743
2017-10-08 16:11:52 +02:00
Tom Elfring
6103bc2b11
Added subtype check to transporter finder
...
Added an extra sybtype check to the transporter finder, just like # 992
Fixes #4694
2017-10-07 20:19:33 +02:00