From c090095e08d29f822ff45d98774bdf7abd6ecec0 Mon Sep 17 00:00:00 2001
From: itzg <itzg@users.noreply.github.com>
Date: Sun, 4 Jul 2021 19:53:56 +0000
Subject: [PATCH 1/4] docs: Auto update markdown TOC

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 46eb154b..36da942a 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,7 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [PVP Mode](#pvp-mode)
       * [Level Type and Generator Settings](#level-type-and-generator-settings)
       * [Custom Server Resource Pack](#custom-server-resource-pack)
-      * [World Save Name](#world-save-name)
+      * [Level / World Save Name](#level--world-save-name)
       * [Online mode](#online-mode)
       * [Allow flight](#allow-flight)
       * [Other server property mappings](#other-server-property-mappings)
@@ -145,7 +145,7 @@ By default, the container will download the latest version of the "vanilla" [Min
       * [Enabling Autopause](#enabling-autopause)
    * [Running on RaspberryPi](#running-on-raspberrypi)
 
-<!-- Added by: runner, at: Mon Jun 28 12:13:57 UTC 2021 -->
+<!-- Added by: runner, at: Sun Jul  4 19:53:56 UTC 2021 -->
 
 <!--te-->
 

From 7ec09fcfe9004b5a49b60276c7362c9f6c10aa6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jul 2021 07:09:06 -0500
Subject: [PATCH 2/4] build(deps): bump docker/build-push-action from 2.5.0 to
 2.6.1 (#950)

---
 .github/workflows/build-multiarch.yml | 2 +-
 .github/workflows/main.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 50ff894d..d06004d8 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -63,7 +63,7 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2.5.0
+        uses: docker/build-push-action@v2.6.1
         with:
           context: .
           platforms: linux/amd64,linux/arm/v7,linux/arm64
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c5de7394..232500a9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,7 +70,7 @@ jobs:
 
     - name: Build and push
       id: docker_build
-      uses: docker/build-push-action@v2.5.0
+      uses: docker/build-push-action@v2.6.1
       with:
         context: .
         file: ./Dockerfile

From 8aa1312ae2aa185a97b2cda685afbfc57499f35f Mon Sep 17 00:00:00 2001
From: NyCode <nico@nycode.de>
Date: Tue, 6 Jul 2021 14:22:01 +0200
Subject: [PATCH 3/4] Fix typo: tunity -> tuinity (#951)

---
 start-deployTuinity | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/start-deployTuinity b/start-deployTuinity
index 54221dd8..052cf4b1 100644
--- a/start-deployTuinity
+++ b/start-deployTuinity
@@ -3,16 +3,16 @@
 . ${SCRIPTS:-/}start-utils
 
 if [ "${VERSION}" != "LATEST" ]; then
-  log "ERROR: Tunity server type only supports VERSION=LATEST"
+  log "ERROR: Tuinity server type only supports VERSION=LATEST"
   exit 1
 fi
 
-: ${TUNITY_BUILD:=lastSuccessfulBuild}
-export SERVER=tunity-${VANILLA_VERSION}-${TUNITY_BUILD}.jar
+: ${TUINITY_BUILD:=lastSuccessfulBuild}
+export SERVER=tuinity-${VANILLA_VERSION}-${TUINITY_BUILD}.jar
 
 if [ ! -f "$SERVER" ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUNITY_BUILD}/artifact/tuinity-paperclip.jar"
-    log "Downloading Tunity (build $TUNITY_BUILD) from $downloadUrl ..."
+    downloadUrl="https://ci.codemc.io/job/Spottedleaf/job/Tuinity/${TUINITY_BUILD}/artifact/tuinity-paperclip.jar"
+    log "Downloading Tuinity (build $TUINITY_BUILD) from $downloadUrl ..."
     curl -fsSL -o "$SERVER" "$downloadUrl"
     if [ ! -f "$SERVER" ]; then
       log "ERROR: failed to download from $downloadUrl (status=$?)"

From cbaef446ac4f3e7d559dbce98539e9449b92356c Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Wed, 7 Jul 2021 16:56:16 +0200
Subject: [PATCH 4/4] fix: don't echo double-double-quotes to server.properties
 (#954)

Using `sed`, we need to escape double quotes, but with `echo` we can just use the variable as-is.
Closes #949
---
 start-finalSetupServerProperties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start-finalSetupServerProperties b/start-finalSetupServerProperties
index 1f8fe822..33708461 100644
--- a/start-finalSetupServerProperties
+++ b/start-finalSetupServerProperties
@@ -19,7 +19,7 @@ function setServerProp {
       sed -i "/^${prop}\s*=/ c ${prop}=${var//\\/\\\\}" "$SERVER_PROPERTIES"
     else
       log "Adding ${prop} with '${var}' in ${SERVER_PROPERTIES}"
-      echo "${prop}=${var//\\/\\\\}" >> "$SERVER_PROPERTIES"
+      echo "${prop}=${var}" >> "$SERVER_PROPERTIES"
     fi
   else
     isDebugging && log "Skip setting ${prop}"