Merge branch 'renovate-org.apache.logging.log4j-log4j-api-2.x' of https://git.griefed.de/Griefed/ServerPackCreator into develop

# Conflicts:
#	build.gradle