 Sebastian Hartte
|
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 |
|
|
shartte
|
b756d68be1
|
Implemented a cache with maximum quad-count it will cache for the cable bus, (#4670)
which also fixes concurrent access to the hashmap.
|
2020-09-01 18:20:51 +02:00 |
|
|
Sebastian Hartte
|
780f68952b
|
Added spotless back and reformatted
|
2020-07-27 20:07:27 +02:00 |
|
|
Sebastian Hartte
|
2642ced86b
|
Moving to source sets
|
2020-07-01 23:36:51 +02:00 |
|
|
Sebastian Hartte
|
f2e3d81fd7
|
Working in part placement
|
2020-07-01 21:27:37 +02:00 |
|
|
yueh
|
5225ea426b
|
pick 97420a31d The big reformat of 2020
|
2020-06-16 21:45:35 +02:00 |
|
|
Sebastian Hartte
|
a005f1c2e8
|
Clear the cable bus model cache when the resource pack is reloaded (otherwise we might return stale models with incorrect texture sprite coordinates).
|
2020-06-16 17:34:56 +02:00 |
|