From 927ec2a2c389c7ad08197016e24594fa995c33b0 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 3 Dec 2021 08:07:40 -0600 Subject: [PATCH 1/3] docs: let users do their own research about Mohist #1107 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 62d2b153..b6ca0c90 100644 --- a/README.md +++ b/README.md @@ -484,8 +484,6 @@ By default, the "stable" channel is used, but you can set `MAGMA_CHANNEL` to "de ### Running a Mohist server -> **CAUTION** Be sure to [read this article](https://essentialsx.net/do-not-use-mohist.html) to understand the risks associated with using Mohist. - A [Mohist](https://github.com/MohistMC/Mohist) server can be used with -e TYPE=MOHIST From 9098b198c336e1dd9c10a9a13b49a629d38be61e Mon Sep 17 00:00:00 2001 From: itzg Date: Fri, 3 Dec 2021 14:07:53 +0000 Subject: [PATCH 2/3] docs: Auto update markdown TOC --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b6ca0c90..b1c7852f 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) - + From 6c636c3d9c5536d0e89f9353496d99b1659ec070 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 4 Dec 2021 09:58:28 -0600 Subject: [PATCH 3/3] fix: corrected versionLessThan to handle b1.7.3 style #1159 --- scripts/start-utils | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/start-utils b/scripts/start-utils index 00f8a9a4..21e57379 100755 --- a/scripts/start-utils +++ b/scripts/start-utils @@ -113,7 +113,9 @@ function normalizeMemSize() { function versionLessThan() { local activeParts - IFS=. read -ra activeParts <<<"${VANILLA_VERSION%%-*}" + version=${VANILLA_VERSION%%-*} # for snapshot/rc versions + version=${version##b} # for versions like b1.7.3 + IFS=. read -ra activeParts <<<"${version}" local givenParts IFS=. read -ra givenParts <<<"$1"