amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-05-31 08:04:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into multiarch-latest

Browse Source 
# Conflicts:
#	start-configuration
This commit is contained in:
Geoff Bourne
2021-02-08 21:28:46 -06:00
parent 6a9551fafe b2d23edf6d
commit a4abb22690
5 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
start-configuration
+11 -3
View File
@@ -94,7 +94,7 @@ case "${TYPE^^}" in
FORGE)
log "**********************************************************************"
log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
log " since some mods require Java 8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployForge "$@"
@@ -108,7 +108,11 @@ case "${TYPE^^}" in
exec ${SCRIPTS:-/}start-deployFTBA "$@"
;;
CURSEFORGE|FTB)
FTB|CURSEFORGE)
log "**********************************************************************"
log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
log " since some mods require Java 8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployCF "$@"
;;
@@ -144,11 +148,15 @@ case "${TYPE^^}" in
exec ${SCRIPTS:-/}start-deployPurpur "$@"
;;
YATOPIA)
exec ${SCRIPTS:-/}start-deployYatopia "$@"
;;
*)
log "Invalid type: '$TYPE'"
log "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTBA (multiarch-only),"
log " CURSE_INSTANCE, CURSEFORGE, SPONGEVANILLA, TUINITY, PURPUR"
log " CUSTOM, MAGMA, MOHIST, CATSERVER"
log " CUSTOM, MAGMA, MOHIST, CATSERVER, YATOPIA"
exit 1
;;