Merge remote-tracking branch 'origin/wip5.7.0' into mapgen_earth

.clang-format

@@ -1,3 +1,5 @@
+ReflowComments: false
+
 BasedOnStyle: LLVM
 IndentWidth: 4
 UseTab: Always

.github/CONTRIBUTING.md

@@ -138,7 +138,7 @@ These notes are for those who have push access Minetest (core developers / maint
 If a Pull Request is not a bug fix:
 
 * If it matches a goal in [the roadmap](../doc/direction.md), then the PR should
-  be labelled as "Roadmap" and the goal stated by number in the description.
+  be labeled as "Roadmap" and the goal stated by number in the description.
 * If it doesn't match a goal, then it needs to receive a concept approval within
   a week of being opened to remain open. This 1 week deadline does not apply to
   PRs opened before the roadmap was adopted; instead, they may remain open or be

.github/workflows/android.yml

@@ -26,6 +26,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
+        fetch-depth: 10
     - name: Install deps
       run: |
         sudo apt-get update

.github/workflows/build.yml

@@ -29,15 +29,20 @@ on:
       - 'Dockerfile'
       - '.dockerignore'
 
+env:
+  MINETEST_POSTGRESQL_CONNECT_STRING: 'host=localhost user=minetest password=minetest dbname=minetest'
+
 jobs:
   # Older gcc version (should be close to our minimum supported version)
   gcc_5:
     if: ${{ false }}
     runs-on: ubuntu-18.04
+    if: "false" # FIXME
     steps:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install deps
         run: |
           source ./util/ci/common.sh
@@ -61,6 +66,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install deps
         run: |
           source ./util/ci/common.sh
@@ -81,10 +87,12 @@ jobs:
   clang_3_9:
     if: ${{ false }}
     runs-on: ubuntu-18.04
+    if: "false" # FIXME
     steps:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install deps
         run: |
           source ./util/ci/common.sh
@@ -112,6 +120,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install deps
         run: |
           source ./util/ci/common.sh
@@ -140,6 +149,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install deps
         run: |
           source ./util/ci/common.sh
@@ -168,6 +178,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Build docker image
         run: |
           docker build . -t minetest:latest
@@ -181,6 +192,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install compiler
         run: |
           sudo apt-get update && sudo apt-get install -y gettext
@@ -202,6 +214,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install compiler
         run: |
           sudo apt-get update && sudo apt-get install -y gettext
@@ -246,7 +259,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
-
+            fetch-depth: 10
 #      - name: Checkout IrrlichtMt
 #        run: |
 #          $ref = @(Get-Content misc\irrlichtmt_tag.txt)

.github/workflows/cpp_lint.yml

@@ -47,6 +47,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
+        fetch-depth: 10
     - name: Install deps
       run: |
         source ./util/ci/common.sh

.github/workflows/lua.yml

@@ -22,6 +22,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
+        fetch-depth: 10
     - name: Install deps
       run: |
         source ./util/ci/common.sh
@@ -48,6 +49,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         submodules: recursive
+        fetch-depth: 10
     - uses: leafo/gh-actions-lua@v9
       with:
         luaVersion: "5.1.5"

.github/workflows/macos.yml

@@ -33,6 +33,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
             submodules: recursive
+            fetch-depth: 10
       - name: Install deps
         run: |
           source ./util/ci/common.sh
@@ -48,7 +49,8 @@ jobs:
             -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \
             -DCMAKE_FIND_FRAMEWORK=LAST \
             -DCMAKE_INSTALL_PREFIX=../build/macos/ \
-            -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE
+            -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE \
+            -DINSTALL_DEVTEST=TRUE
           make -j2
           make install
 

.gitignore

@@ -30,6 +30,8 @@ gtags.files
 build/.cmake/
 # Gradle
 .gradle
+# Clang
+.cache
 
 ## Files related to Minetest development cycle
 /*.patch
@@ -41,17 +43,17 @@ build/.cmake/
 /bin/
 /games/*
 !/games/devtest/
+/games/devtest/mods/soundstuff/sounds/gitignored_sounds/*
+!/games/devtest/mods/soundstuff/sounds/gitignored_sounds/custom_sounds_here.txt
 /cache
 /textures/*
 !/textures/base/
 /screenshots
 /sounds
 /mods/*
-!/mods/minetest/
-/mods/minetest/*
-!/mods/minetest/mods_here.txt
-/worlds
-/world/
+!/mods/mods_here.txt
+/worlds/*
+!/worlds/worlds_here.txt
 /clientmods/*
 !/clientmods/preview/
 /client/mod_storage/
@@ -128,6 +130,7 @@ auto_*
 util/autotest/logs.*
 util/autotest/auto.json
 util/autotest/world
+util/autotest/screenshot*
 client/favoriteservers.json
 client/servers_public.json