Merge branch 'renovate-core-js-3.x' of...

Merge branch 'renovate-core-js-3.x' of https://git.griefed.de/Griefed/ServerPackCreator into develop

# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json