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

..

implementations

Fix network status screen showing translation keys.

2020-08-05 23:11:31 +02:00

widgets

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

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

AEBaseMEScreen.java

Ported to 1.16.2-pre

2020-08-01 17:14:12 +02:00

AEBaseScreen.java

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

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

NumberEntryType.java

Formatting fixes

2020-07-19 23:50:47 +02:00

Size1Slot.java

Added spotless back and reformatted

2020-07-27 20:07:27 +02:00