From f97cea4b06ee1c236b5199ec848df9005d3f53a1 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 4 Nov 2021 21:49:03 -0500
Subject: [PATCH 1/5] misc: adjusted debug logs when SKIP_SERVER_PROPERTIES
 #1108

---
 scripts/start-setupServerProperties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/start-setupServerProperties b/scripts/start-setupServerProperties
index 80931ec2..3e67e6bf 100755
--- a/scripts/start-setupServerProperties
+++ b/scripts/start-setupServerProperties
@@ -217,9 +217,9 @@ if isTrue "${ENABLE_AUTOPAUSE}"; then
   fi
 fi
 
-if isDebugging; then
+if isDebugging && [ -f "${SERVER_PROPERTIES}" ]; then
   log "DEBUG Dumping server.properties"
   cat "${SERVER_PROPERTIES}"
 fi
 
-exec ${SCRIPTS:-/}start-setupEnvVariables $@
+exec "${SCRIPTS:-/}start-setupEnvVariables" "$@"

From 402894cd8d543ba9c2d05c172e88822601652fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vorburger=20=E2=9B=91=EF=B8=8F?=
 <mike@vorburger.ch>
Date: Fri, 5 Nov 2021 20:38:02 +0100
Subject: [PATCH 2/5] document that default RCON_PASSWORD = minecraft in README
 (#1109)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4a263a33..39afd412 100644
--- a/README.md
+++ b/README.md
@@ -875,6 +875,7 @@ The server icon which has been set doesn't get overridden by default. It can be
 ### Rcon
 
 To use rcon use the `ENABLE_RCON` and `RCON_PASSWORD` variables.
+The default RCON password is _"minecraft",_ but it's **highly** recommended to override that.
 By default rcon port will be `25575` but can easily be changed with the `RCON_PORT` variable.
 
     docker run -d -e ENABLE_RCON=true -e RCON_PASSWORD=testing

From fc958faf7ba6150dfed93c16bc24ca8e4da9cd7c Mon Sep 17 00:00:00 2001
From: itzg <itzg@users.noreply.github.com>
Date: Fri, 5 Nov 2021 19:39:25 +0000
Subject: [PATCH 3/5] docs: Auto update markdown TOC

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39afd412..411460b4 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ By default, the container will download the latest version of the "vanilla" [Min
    * [Running on RaspberryPi](#running-on-raspberrypi)
    * [Contributing](#contributing)
 
-<!-- Added by: runner, at: Fri Nov  5 02:00:06 UTC 2021 -->
+<!-- Added by: runner, at: Fri Nov  5 19:39:24 UTC 2021 -->
 
 <!--te-->
 

From cafddd3b12401a5d1dfe0039f4f7b28d4d31edf7 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 6 Nov 2021 21:34:10 -0500
Subject: [PATCH 4/5] Used minecraft_server.jar for versions before 1.6 #306

---
 scripts/start-deployVanilla | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/start-deployVanilla b/scripts/start-deployVanilla
index 0b618800..2bdc08aa 100755
--- a/scripts/start-deployVanilla
+++ b/scripts/start-deployVanilla
@@ -41,6 +41,14 @@ if [ ! -e "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   fi
 fi
 
+if versionLessThan 1.16; then
+  if ! [[ -L /data/minecraft_server.jar && /data/minecraft_server.jar -ef "/data/$SERVER" ]]; then
+    rm -f /data/minecraft_server.jar
+    ln -s "/data/$SERVER" /data/minecraft_server.jar
+  fi
+  SERVER=minecraft_server.jar
+fi
+
 isDebugging && ls -l
 
 exec "${SCRIPTS:-/}start-setupWorld" "$@"

From a8de790b57cc38178506bdbed4d93d7d2e112226 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 6 Nov 2021 21:35:57 -0500
Subject: [PATCH 5/5] Used minecraft_server.jar for versions before 1.6 #306

---
 scripts/start-deployVanilla | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/start-deployVanilla b/scripts/start-deployVanilla
index 2bdc08aa..ed8eadbc 100755
--- a/scripts/start-deployVanilla
+++ b/scripts/start-deployVanilla
@@ -41,7 +41,7 @@ if [ ! -e "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
   fi
 fi
 
-if versionLessThan 1.16; then
+if versionLessThan 1.6; then
   if ! [[ -L /data/minecraft_server.jar && /data/minecraft_server.jar -ef "/data/$SERVER" ]]; then
     rm -f /data/minecraft_server.jar
     ln -s "/data/$SERVER" /data/minecraft_server.jar