From 4f8bd24cf122528563dab232e2010d17b33706ac Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Tue, 12 Dec 2017 23:25:07 +0100 Subject: [PATCH] [minetest_game] Upgrade minetest game submodule to branch backport-0.4 --- .gitmodules | 8 ++++---- minetest_game | 1 + minetestforfun_game | 1 - other_things/scripts/Server-side/script/start-mff.sh | 2 +- worlds/minetestforfun/world.mt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 160000 minetest_game delete mode 160000 minetestforfun_game diff --git a/.gitmodules b/.gitmodules index 4b06972d..0020a6f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -120,10 +120,6 @@ [submodule "mods/stacktraceplus"] path = mods/stacktraceplus url = https://github.com/MinetestForFun/stacktraceplus.git -[submodule "minetestforfun_game"] - path = minetestforfun_game - url = https://github.com/sys4-fr/minetest_game.git - branch = nalc [submodule "mods/cherry_tree"] path = mods/cherry_tree url = https://github.com/sys4-fr/cherry_tree.git @@ -150,3 +146,7 @@ [submodule "mods/item_drop"] path = mods/item_drop url = https://github.com/tacotexmex/item_drop.git +[submodule "minetest_game"] + path = minetest_game + url = https://github.com/minetest/minetest_game.git + branch = backport-0.4 diff --git a/minetest_game b/minetest_game new file mode 160000 index 00000000..7a4b1e0c --- /dev/null +++ b/minetest_game @@ -0,0 +1 @@ +Subproject commit 7a4b1e0ce13750904e56938d3414ef60093a2b6e diff --git a/minetestforfun_game b/minetestforfun_game deleted file mode 160000 index d5b9fee6..00000000 --- a/minetestforfun_game +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d5b9fee6fe2c3c09678851d047e6f05d71f01e55 diff --git a/other_things/scripts/Server-side/script/start-mff.sh b/other_things/scripts/Server-side/script/start-mff.sh index a9c8e37a..edea3260 100755 --- a/other_things/scripts/Server-side/script/start-mff.sh +++ b/other_things/scripts/Server-side/script/start-mff.sh @@ -18,7 +18,7 @@ while true /home/vincent/jeux/mff/bin/minetestserver \ --world /home/vincent/jeux/mff/worlds/minetestforfun/ \ --config /home/vincent/jeux/mff/minetest.conf \ - --gameid minetestforfun_game \ + --gameid minetest_game \ --port 30002 \ # --logfile $DEBUG diff --git a/worlds/minetestforfun/world.mt b/worlds/minetestforfun/world.mt index db73ec6c..fe5204cd 100644 --- a/worlds/minetestforfun/world.mt +++ b/worlds/minetestforfun/world.mt @@ -1,4 +1,4 @@ -gameid = minetestforfun_game +gameid = minetest_game backend = redis redis_hash = mff_sys4 redis_address = localhost