Sebastian Hartte
c0575e11b0
Merge remote-tracking branch 'origin/master' into fabric/master
# Conflicts:
# build.gradle
# gradle.properties
# gradle/scripts/artifacts.gradle
# gradle/scripts/curseforge.gradle
# gradle/wrapper/gradle-wrapper.jar
# gradle/wrapper/gradle-wrapper.properties
# src/main/java/appeng/block/networking/CableBusBlock.java
# src/main/java/appeng/client/gui/AEBaseScreen.java
# src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
# src/main/java/appeng/client/gui/widgets/Scrollbar.java
# src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
# src/main/java/appeng/tile/AEBaseBlockEntity.java
# src/main/resources/META-INF/mods.toml