Merge branch 'multiarch' into java8-multiarch

# Conflicts: # Dockerfile # start-configuration
2026-07-06 08:35:10 +00:00 · 2021-05-14 17:59:49 -05:00
parent ced25ad50a 671e84bec9
commit 4fb791b490
19 changed files with 148 additions and 178 deletions
@@ -109,7 +109,7 @@ case "${TYPE^^}" in
    exec ${SCRIPTS:-/}start-deployFTBA "$@"
  ;;

-  CURSEFORGE|FTB)
+  FTB|CURSEFORGE)
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;