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

# Conflicts:
#	src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java
This commit is contained in:
Sebastian Hartte
2020-08-11 16:35:05 +02:00
@@ -24,7 +24,7 @@ import appeng.core.AEConfig;
public class NumberEntryWidget implements ITickingWidget {
private static final Text PLUS = Text.of("+");
private static final Text MINUS = Text.of("+");
private static final Text MINUS = Text.of("-");
private final AEBaseScreen<?> parent;