89ea923c43
Merge fixes
2020-09-02 19:41:44 +02:00
e34126458b
Merge remote-tracking branch 'origin/master' into fabric/master
...
# Conflicts:
# gradle.properties
# src/main/java/appeng/client/gui/Size1Slot.java
# src/main/java/appeng/client/me/SlotFluidME.java
# src/main/java/appeng/client/me/SlotME.java
# src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
# src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java
# src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java
# src/main/java/appeng/core/sync/packets/MEInterfaceUpdatePacket.java
# src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java
# src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java
# src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
# src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
# src/main/java/appeng/fluids/helper/FluidCellConfig.java
# src/main/resources/META-INF/mods.toml
2020-09-02 02:45:31 +02:00
db9ec2b070
Remove the use of SlotItemHandler since we are only faking an inventory-backed slot, ( #4654 )
...
we might as well use what we had used pre-2017, which is simply extending a normal Slot.
This should also fix #4652 .
2020-08-29 22:03:35 +02:00
68a02ed64b
Updated to 1.16.2-rc2
2020-08-11 16:20:31 +02:00
1478e4c378
Lots more moved
2020-07-04 21:03:30 +02:00
2642ced86b
Moving to source sets
2020-07-01 23:36:51 +02:00
fe215f0a91
Code Cleanup
2020-06-19 16:09:06 +02:00
5225ea426b
pick 97420a31d The big reformat of 2020
2020-06-16 21:45:35 +02:00
7747804385
More Container / GUI fixes
2020-06-02 11:40:36 +02:00
16d6d55d7f
1.15 port
2020-05-18 14:02:45 +02:00
5d26b98ab8
Fluid cleanup and performance improvements ( #3581 )
...
Use custom gui widget with custom synchronization for rendering fake fluid slots.
2018-07-04 19:12:12 +02:00
046a27bf4c
Fixes #3560 : Render the fluid stacksize for ME fluid slots. ( #3562 )
2018-06-24 17:22:07 +02:00
d16677224a
Initial Fluid Integration ( #3510 )
...
* Added Fluid Storage Cells
* Added Fluid Import Bus
* Added Fluid Export Bus
* Added Fluid Storage Bus
* Added Fluid Terminal.
While holding a item with the FLUID_HANDLER_ITEM_CAPABILITY, such as a tank
Left click on a fluid to extract the fluid
Right click to insert the fluid
2018-06-11 19:55:33 +02:00
Sebastian Hartte