Sebastian Hartte 3c737d8d1e Merge remote-tracking branch 'origin/master' into fabric/master ...

# Conflicts:
#	src/main/java/appeng/client/gui/AEBaseScreen.java
#	src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java
#	src/main/java/appeng/client/gui/widgets/ITooltip.java
#	src/main/java/appeng/client/gui/widgets/IconButton.java
#	src/main/java/appeng/client/gui/widgets/ProgressBar.java
#	src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
#	src/main/java/appeng/client/gui/widgets/ToggleButton.java
#	src/main/java/appeng/container/slot/PlayerInvSlot.java
#	src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java
#	src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java
#	src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
#	src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
#	src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
#	src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
#	src/main/java/appeng/parts/automation/FormationPlanePart.java
#	src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
#	src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java

2020-08-05 23:40:58 +02:00

..

api/java/appeng/api

Fixes 4529: Updated IPart to match new ICapabilityProvider (#4534)

2020-08-01 21:01:19 +02:00

datagen

Formatting Fixes

2020-08-01 17:24:48 +02:00

main

Merge remote-tracking branch 'origin/master' into fabric/master

2020-08-05 23:40:58 +02:00

test

Fix server startup, jar building and after-merge fixes.

2020-07-28 22:45:09 +02:00

unported

Merge remote-tracking branch 'origin/master' into fabric-1.16

2020-07-28 22:08:09 +02:00