Merge latest from master

This commit is contained in:
Geoff Bourne
2022-01-30 12:08:38 -06:00
51 changed files with 470 additions and 245 deletions

View File

@@ -56,7 +56,6 @@ if [ ! -d "$librariesDir" ]; then
fi
export SERVER
export SKIP_LOG4J_CONFIG=true
export FAMILY=HYBRID
exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"