Sebastian Hartte 4e86c92720 Merge remote-tracking branch 'origin/master' into fabric/master ...

# Conflicts:
#	src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java

2020-08-24 22:34:26 +02:00

..

implementations

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

2020-08-24 22:34:26 +02:00

widgets

Added initial TechReborn compatibility to the EnergyAcceptor.

2020-08-16 18:14:57 +02:00

AEBaseMEScreen.java

Initial port to 1.16.2

2020-08-13 23:15:09 +02:00

AEBaseScreen.java

Fixup imports + formatting.

2020-08-15 03:18:23 +02:00

NumberEntryType.java

Formatting fixes

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

Size1Slot.java

Reformatted, and ported back some enhancements from the Forge version.

2020-08-15 02:51:03 +02:00