From 200b3fcdc62035d1690d7dceaf2954fb5a2e460b Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Wed, 29 Apr 2020 19:28:29 -0400 Subject: [PATCH] Add new lapis columns variable name. Allow setting RUN_IN_PLACE in env. --- build-minetest-here.sh | 4 +++- patches/subgame/minetest.server-example.conf | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-minetest-here.sh b/build-minetest-here.sh index 37304ac..c9751cf 100755 --- a/build-minetest-here.sh +++ b/build-minetest-here.sh @@ -12,7 +12,9 @@ fi if [ -f bin/minetest ]; then make clean || customDie "$0: make clean failed in '`pwd`'." fi -RUN_IN_PLACE=0 +if [ -z "$RUN_IN_PLACE" ]; then + RUN_IN_PLACE=0 +fi cmake . -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 -DENABLE_LEVELDB=1 -DENABLE_REDIS=1 -DRUN_IN_PLACE=$RUN_IN_PLACE && make -j$(grep -c processor /proc/cpuinfo) || customDie "$0: Build failed in '`pwd`'." echo if [ "@$RUN_IN_PLACE" = "@1" ]; then diff --git a/patches/subgame/minetest.server-example.conf b/patches/subgame/minetest.server-example.conf index 456521b..145786f 100644 --- a/patches/subgame/minetest.server-example.conf +++ b/patches/subgame/minetest.server-example.conf @@ -3,7 +3,7 @@ # motd = "Actions and chat messages are logged. Recipes are in unified inventory mod. Otherwise visit the server's website for more info about mods and live map if available--if not, see http://wiki.minetest.net/Main_Page and https://github.com/minetest-technic/technic/wiki" motd = Actions and chat messages are logged. Use inventory to see recipes. Priveleges may be limited for new users, so ask a moderator to /grant priveleges. disallow_empty_passwords = true - +enable_lapis_mod_columns = true # (default 180, or 80 if enable_wonder is true; minimum is 10 # see ) hunger_tick = 216