Sebastian Hartte 73cc3f8998 Merge remote-tracking branch 'origin/master' into fabric/master ...

# Conflicts:
#	gradle.properties
#	src/main/java/appeng/core/api/definitions/ApiItems.java

2020-08-23 21:08:47 +02:00

..

artifacts.gradle

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

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

curseforge.gradle

Further testing tags

2020-08-15 18:42:20 +02:00

dependencies.gradle

Re-Enabled JEI and TOP in dev.

2020-08-22 19:56:37 +02:00

spotless.gradle

Removed Hywla for now due to breaking our builds (#4421)

2020-06-18 16:02:24 +02:00