2025-03-06 20:48:40 +01:00
1488 changed files with 109688 additions and 131378 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,4 +1,4 @@
-Checks: '-*,modernize-use-emplace,modernize-avoid-bind,misc-throw-by-value-catch-by-reference,misc-unconventional-assign-operator,performance-*,-performance-avoid-endl,performance-inefficient-string-concatenation'
+Checks: '-*,modernize-use-emplace,modernize-avoid-bind,misc-throw-by-value-catch-by-reference,misc-unconventional-assign-operator,performance-*'
 WarningsAsErrors: '-*,modernize-use-emplace,performance-type-promotion-in-math-fn,performance-faster-string-find,performance-implicit-cast-in-loop'
 CheckOptions:
  - key: performance-unnecessary-value-param.AllowedTypes
--- a/.editorconfig
+++ b/.editorconfig
@ -1,16 +1,9 @@
 [*]
 end_of_line = lf

-[*.{cpp,h,lua,txt,glsl,c,cmake,java,gradle}]
+[*.{cpp,h,lua,txt,glsl,md,c,cmake,java,gradle}]
 charset = utf-8
 indent_size = 4
 indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.md]
-charset = utf-8
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true
--- a/.gitattributes
+++ b/.gitattributes
@ -3,6 +3,3 @@

 *.cpp diff=cpp
 *.h diff=cpp
-
-*.gltf binary
-*.x binary
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -14,7 +14,7 @@ Contributions are welcome! Here's how you can help:
   [clone](https://help.github.com/articles/cloning-a-repository/) your fork.

 2. Before you start coding, consider opening an
-   [issue on Github](https://github.com/luanti-org/luanti/issues) to discuss the
+   [issue at Github](https://github.com/minetest/minetest/issues) to discuss the
   suitability and implementation of your intended contribution with the core
   developers.

@ -25,19 +25,19 @@ Contributions are welcome! Here's how you can help:
   the work, to avoid disappointment.

   You may also benefit from discussing on our IRC development channel
-   [#luanti-dev](http://www.luanti.org/irc/). Note that a proper IRC client
+   [#minetest-dev](http://www.minetest.net/irc/). Note that a proper IRC client
   is required to speak on this channel.

 3. Start coding!
    - Refer to the
-      [Lua API](https://github.com/luanti-org/luanti/blob/master/doc/lua_api.md),
-      [Developer Wiki](https://dev.luanti.org/) and other
-      [documentation](https://github.com/luanti-org/luanti/tree/master/doc).
-    - Follow the [C/C++](https://dev.luanti.org/Code_style_guidelines) and
-      [Lua](https://dev.luanti.org/Lua_code_style_guidelines) code style guidelines.
+      [Lua API](https://github.com/minetest/minetest/blob/master/doc/lua_api.md),
+      [Developer Wiki](http://dev.minetest.net/Main_Page) and other
+      [documentation](https://github.com/minetest/minetest/tree/master/doc).
+    - Follow the [C/C++](http://dev.minetest.net/Code_style_guidelines) and
+      [Lua](http://dev.minetest.net/Lua_code_style_guidelines) code style guidelines.
    - Check your code works as expected and document any changes to the Lua API.
    - To avoid conflicting changes between contributions, do not do the following manually. They will be done before each release.
-      - Run `updatepo.sh` or update `luanti.po{,t}` even if your code adds new translatable strings.
+      - Run `updatepo.sh` or update `minetest.po{,t}` even if your code adds new translatable strings.
      - Update `minetest.conf.example` and `settings_translation_file.cpp` even if your code adds new core settings.

 4. Commit & [push](https://help.github.com/articles/pushing-to-a-remote/) your changes to a new branch (not `master`, one change per branch)
@ -53,7 +53,7 @@ Contributions are welcome! Here's how you can help:
    - The following lines should describe the commit, starting a new line for each point.

 5. Once you are happy with your changes, submit a pull request.
-     - Open the [pull-request form](https://github.com/luanti-org/luanti/pull/new/master).
+     - Open the [pull-request form](https://github.com/minetest/minetest/pull/new/master).
     - Add a description explaining what you've done (or if it's a
       work-in-progress - what you need to do).
     - Make sure to fill out the pull request template.
@ -64,8 +64,8 @@ Contributions are welcome! Here's how you can help:
   picture of the project.
 2. It works.
 3. It follows the code style for
-   [C/C++](https://dev.luanti.org/Code_style_guidelines) or
-   [Lua](https://dev.luanti.org/Lua_code_style_guidelines).
+   [C/C++](http://dev.minetest.net/Code_style_guidelines) or
+   [Lua](http://dev.minetest.net/Lua_code_style_guidelines).
 4. The code's interfaces are well designed, regardless of other aspects that
   might need more work in the future.
 5. It uses protocols and formats which include the required compatibility.
@ -76,14 +76,14 @@ If you experience an issue, we would like to know the details - especially when
 a stable release is on the way.

 1. Do a quick search on GitHub to check if the issue has already been reported.
-2. Is it an issue with the Luanti *engine*? If not, report it
-   [elsewhere](http://www.luanti.org/development/#reporting-issues).
-3. [Open an issue](https://github.com/luanti-org/luanti/issues/new) and describe
+2. Is it an issue with the Minetest *engine*? If not, report it
+   [elsewhere](http://www.minetest.net/development/#reporting-issues).
+3. [Open an issue](https://github.com/minetest/minetest/issues/new) and describe
   the issue you are having - you could include:
     - Error logs (check the bottom of the `debug.txt` file).
     - Screenshots.
     - Ways you have tried to solve the issue, and whether they worked or not.
-     - Your Luanti version and the content (games, mods or texture packs) you have installed.
+     - Your Minetest version and the content (games, mods or texture packs) you have installed.
     - Your platform (e.g. Windows 10 or Ubuntu 15.04 x64).

 After reporting you should aim to answer questions or clarifications as this
@ -99,28 +99,28 @@ possible.

 ## Translations

-The core translations of Luanti are performed using Weblate. You can access
+The core translations of Minetest are performed using Weblate. You can access
 the project page with a list of current languages
 [here](https://hosted.weblate.org/projects/minetest/minetest/).

 Builtin (the component which contains things like server messages, chat command
 descriptions, privilege descriptions) is translated separately; it needs to be
 translated by editing a `.tr` text file. See
-[Translation](https://dev.luanti.org/Translation) for more information.
+[Translation](https://dev.minetest.net/Translation) for more information.

 ## Donations

-If you'd like to monetarily support Luanti development, you can find donation
-methods on [our website](http://www.luanti.org/development/#donate).
+If you'd like to monetarily support Minetest development, you can find donation
+methods on [our website](http://www.minetest.net/development/#donate).

 # Maintaining

 * This is a concise version of the
-  [Rules & Guidelines](https://dev.luanti.org/engine-dev-process/) on the developer wiki.*
+  [Rules & Guidelines](http://dev.minetest.net/Category:Rules_and_Guidelines) on the developer wiki.*

-These notes are for those who have push access Luanti (core developers / maintainers).
+These notes are for those who have push access Minetest (core developers / maintainers).

- See the [project organisation](https://dev.luanti.org/Organisation) for the people involved.
+- See the [project organisation](http://dev.minetest.net/Organisation) for the people involved.

 ## Concept approvals and roadmaps

@ -159,14 +159,14 @@ Submit a :+1: (+1) or "Looks good" comment to show you believe the pull-request
    - The title should follow the commit guidelines (title starts with a capital letter, present tense, descriptive).
    - Don't modify history older than 10 minutes.
    - Use rebase, not merge to get linear history:
-    - `curl -Ls https://github.com/luanti-org/luanti/pull/1.patch | git am`
+    - `curl https://github.com/minetest/minetest/pull/1.patch | git am`

 ## Reviewing issues and feature requests

 - If an issue does not get a response from its author within 1 month (when requiring more details), it can be closed.
 - When an issue is a duplicate, refer to the first ones and close the later ones.
- Tag issues with the appropriate [labels](https://github.com/luanti-org/luanti/labels) for devices, platforms etc.
+- Tag issues with the appropriate [labels](https://github.com/minetest/minetest/labels) for devices, platforms etc.

 ## Releasing a new version

-*Refer to [dev.luanti.org/Releasing_Luanti](https://dev.luanti.org/Releasing_Luanti)*
+*Refer to [dev.minetest.net/Releasing_Minetest](http://dev.minetest.net/Releasing_Minetest)*
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@ -6,24 +6,22 @@ body:
    attributes:
      value: |
        Please note the following:
-
-        1. **Please update Luanti to the latest stable or dev version** before submitting bug reports. Make sure the bug is still reproducible on the latest version.
-        2. This page is for reporting the bugs of **the engine itself**. For bugs in a particular game, please [search for the game in the ContentDB](https://content.luanti.org/packages/?type=game) and submit a bug report in their issue trackers.
-            * For example, you can submit issues about the Minetest Game [in its own repository](https://github.com/luanti-org/minetest_game/issues).
+        1. **Please update your Minetest Engine to the latest stable or dev version** before submitting bug reports. Make sure the bug is still reproducible on the latest version.
+        2. This page is for reporting the bugs of **the engine itself**. For bugs in a particular game, please [search for the game in the ContentDB](https://content.minetest.net/packages/?type=game) and submit a bug report in their issue trackers.
+            * For example, you can submit issues about the Minetest Game (the official game of Minetest) [in its own repository](https://github.com/minetest/minetest_game/issues).
        3. Please provide as many details as possible for us to spot the problem quicker.
  - type: textarea
    attributes:
-      label: Luanti version
+      label: Minetest version
      description: |
-        Paste the Luanti version below.
+        Paste the Minetest version below.
        If you are on a dev version, please also indicate the git commit hash.
-        Refer to the "About" tab of the menu or run `luanti --version` on the command line.
+        Refer to the "About" tab of the menu or run `minetest --version` on the command line.
      placeholder: |
        Example:
-        Luanti 5.10.0-3ad6aee9b (Linux)
-        Using LuaJIT 2.1.1727870382
-        Built by GCC 14.2
-        Running on Linux/6.11.5 x86_64
+        Minetest 5.7.0-dev-ca13c51 (Linux)
+        Using Irrlicht 1.9.0mt9
+        Using LuaJIT 2.1.0-beta3
        BUILD_TYPE=Release
        RUN_IN_PLACE=1
        USE_CURL=1
@ -34,6 +32,13 @@ body:
      render: "true"
    validations:
      required: true
+  - type: input
+    attributes:
+      label: Irrlicht device
+      description:
+      placeholder: "Example: X11"
+    validations:
+      required: false
  - type: input
    attributes:
      label: Operating system and version
@ -62,7 +67,7 @@ body:
    attributes:
      label: Active renderer
      description: You can find this in the "About" tab in the main menu.
-      placeholder: "Example: ES 3.2 / ogles2 / X11"
+      placeholder: "Example: OpenGL 4.6.0"
    validations:
      required: false
  - type: textarea
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
  - name: Submit issues about Minetest Game
-    url: https://github.com/luanti-org/minetest_game/issues/new
+    url: https://github.com/minetest/minetest_game/issues/new/choose
    about: Only submit issues of the engine in this repository's issue tracker. Submit those of Minetest Game in its own issue tracker.
  - name: Search for issue trackers of third-party games
-    url: https://content.luanti.org/packages/?type=game
+    url: https://content.minetest.net/packages/?type=game
    about: For issues of third-party games, search for the game in the ContentDB and then submit an issue in their issue tracker.
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@ -7,7 +7,7 @@ body:
      value: |
        Please note the following:
        1. Only submit a feature request if the feature does not exist on the latest dev version.
-        2. This page is for suggesting changes to **the engine itself**. To suggest changes to games, please [search for the game in the ContentDB](https://content.luanti.org/packages/?type=game) and submit a feature request in their issue trackers.
+        2. This page is for suggesting changes to **the engine itself**. To suggest changes to games, please [search for the game in the ContentDB](https://content.minetest.net/packages/?type=game) and submit a feature request in their issue trackers.
  - type: textarea
    attributes:
      label: Problem
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -3,7 +3,7 @@ Add compact, short information about your PR for easier understanding:
 - Goal of the PR
 - How does the PR work?
 - Does it resolve any reported issue?
- Does this relate to a goal in [the roadmap](https://github.com/luanti-org/luanti/blob/master/doc/direction.md)?
+- Does this relate to a goal in [the roadmap](https://github.com/minetest/minetest/blob/master/doc/direction.md)?
 - If not a bug fix, why is this PR needed? What usecases does it solve?

 ## To do
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@ -3,7 +3,7 @@
 ## Supported Versions

 We only support the latest stable version for security issues.
-See the [releases page](https://github.com/luanti-org/luanti/releases).
+See the [releases page](https://github.com/minetest/minetest/releases).

 ## Reporting a Vulnerability

@ -11,10 +11,10 @@ We ask that you report vulnerabilities privately, by contacting a core developer
 to give us time to fix them. You can do that by emailing one of the following addresses:

 * celeron55@gmail.com
-* rw@rubenwardy.com
+* rubenwardy@minetest.net

 Depending on severity, we will either create a private issue for the vulnerability
-and release a patch version of Luanti, or give you permission to file the issue publicly.
+and release a patch version of Minetest, or give you permission to file the issue publicly.

 For more information on the justification of this policy, see
 [Responsible Disclosure](https://en.wikipedia.org/wiki/Responsible_disclosure).
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -12,7 +12,6 @@ on:
      - 'irr/**.cpp'
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - 'android/**'
      - '.github/workflows/android.yml'
  pull_request:
@ -25,7 +24,6 @@ on:
      - 'irr/**.cpp'
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - 'android/**'
      - '.github/workflows/android.yml'

@ -52,25 +50,25 @@ jobs:
    - name: Save AAB artifact
      uses: actions/upload-artifact@v4
      with:
-        name: Luanti-release.aab
+        name: Minetest-release.aab
        path: android/app/build/outputs/bundle/release/app-release.aab
    - name: Save armeabi artifact
      uses: actions/upload-artifact@v4
      with:
-        name: Luanti-armeabi-v7a.apk
+        name: Minetest-armeabi-v7a.apk
        path: android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
    - name: Save arm64 artifact
      uses: actions/upload-artifact@v4
      with:
-        name: Luanti-arm64-v8a.apk
+        name: Minetest-arm64-v8a.apk
        path: android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
    - name: Save x86 artifact
      uses: actions/upload-artifact@v4
      with:
-        name: Luanti-x86.apk
+        name: Minetest-x86.apk
        path: android/app/build/outputs/apk/release/app-x86-release-unsigned.apk
    - name: Save x86_64 artifact
      uses: actions/upload-artifact@v4
      with:
-        name: Luanti-x86_64.apk
+        name: Minetest-x86_64.apk
        path: android/app/build/outputs/apk/release/app-x86_64-release-unsigned.apk
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@ -72,8 +72,8 @@ jobs:
        with:
          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
          labels: |
-            org.opencontainers.image.title=Luanti
-            org.opencontainers.image.vendor=Luanti
+            org.opencontainers.image.title=Minetest
+            org.opencontainers.image.vendor=Minetest
            org.opencontainers.image.licenses=LGPL-2.1-only

      # Build and push Docker image
@ -94,5 +94,5 @@ jobs:

      - name: Test Docker Image
        run: |
-          docker run --rm $(cut -d, -f1 <<<"$DOCKER_METADATA_OUTPUT_TAGS") luantiserver --version
+          docker run --rm $(cut -d, -f1 <<<"$DOCKER_METADATA_OUTPUT_TAGS") minetestserver --version
        shell: bash
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -12,8 +12,9 @@ on:
      - 'irr/**.cpp'
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - 'util/ci/**'
+      - 'Dockerfile'
+      - '.dockerignore'
      - '.github/workflows/linux.yml'
  pull_request:
    paths:
@ -25,8 +26,9 @@ on:
      - 'irr/**.cpp'
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - 'util/ci/**'
+      - 'Dockerfile'
+      - '.dockerignore'
      - '.github/workflows/linux.yml'

 env:
@ -49,12 +51,10 @@ jobs:
        env:
          CC: gcc-7
          CXX: g++-7
-          # Test fallback SHA implementations
-          CMAKE_FLAGS: '-DENABLE_OPENSSL=0'

      - name: Test
        run: |
-          ./bin/luanti --run-unittests
+          ./bin/minetest --run-unittests

  # Current gcc version
  gcc_14:
@ -78,7 +78,7 @@ jobs:
          mkdir nowrite
          chmod a-w nowrite
          cd nowrite
-          ../bin/luanti --run-unittests
+          ../bin/minetest --run-unittests

  # Older clang version (should be close to our minimum supported version)
  clang_7:
@ -88,7 +88,7 @@ jobs:
      - name: Install deps
        run: |
          source ./util/ci/common.sh
-          install_linux_deps clang-7 llvm-7
+          install_linux_deps clang-7 llvm

      - name: Build
        run: |
@ -100,12 +100,7 @@ jobs:

      - name: Unittest
        run: |
-          ./bin/luanti --run-unittests
-
-      # Do this here because we have ASan and error paths are sensitive to dangling pointers
-      - name: Test error cases
-        run: |
-          ./util/test_error_cases.sh
+          ./bin/minetest --run-unittests

  # Current clang version
  clang_18:
@ -126,7 +121,7 @@ jobs:

      - name: Test
        run: |
-          ./bin/luanti --run-unittests
+          ./bin/minetest --run-unittests

      - name: Integration test + devtest
        run: |
@ -156,4 +151,4 @@ jobs:

      - name: Test
        run: |
-          ./bin/luantiserver --run-unittests
+          ./bin/minetestserver --run-unittests
--- a/.github/workflows/lua.yml
+++ b/.github/workflows/lua.yml
@ -35,7 +35,7 @@ jobs:

    - name: Integration test + devtest
      run: |
-        serverconf="profiler.load=true" ./util/test_multiplayer.sh
+        ./util/test_multiplayer.sh

  luacheck:
    name: "Builtin Luacheck and Unit Tests"
--- a/.github/workflows/lua_api_deploy.yml
+++ b/.github/workflows/lua_api_deploy.yml
@ -16,7 +16,7 @@ on:

 jobs:
  build:
-    if: github.repository == 'luanti-org/luanti'
+    if: github.repository == 'minetest/minetest'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@ -13,7 +13,6 @@ on:
      - 'irr/**.mm' # Objective-C(++)
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - '.github/workflows/macos.yml'
  pull_request:
    paths:
@ -26,12 +25,11 @@ on:
      - 'irr/**.mm' # Objective-C(++)
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - '.github/workflows/macos.yml'

 jobs:
-  build-intel-macos:
-    # use lowest possible macOS running on x86_64 supported by brew to support more users
+  build:
+    # use macOS 13 since it's the last one that still runs on x86
    runs-on: macos-13
    steps:
      - uses: actions/checkout@v4
@ -55,7 +53,7 @@ jobs:

      - name: Test
        run: |
-          ./build/macos/luanti.app/Contents/MacOS/luanti --run-unittests
+          ./build/macos/minetest.app/Contents/MacOS/minetest --run-unittests

      # Zipping the built .app preserves permissions on the contained files,
      #   which the GitHub artifact pipeline would otherwise strip away.
@ -68,46 +66,5 @@ jobs:

      - uses: actions/upload-artifact@v4
        with:
-          name: luanti-macos
+          name: minetest-macos
          path: ./build/macos/*.zip
-  build-arm-macos-xcode:
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install deps
-        run: |
-          source ./util/ci/common.sh
-          install_macos_deps
-          # brew jsoncpp do not include libjsoncpp.a, and if installed header conflict caused build failure
-          brew uninstall jsoncpp
-
-      - name: Build with Cmake
-        run: |
-          mkdir build
-          cd build
-          cmake .. \
-            -DCMAKE_OSX_DEPLOYMENT_TARGET=14 \
-            -DCMAKE_FIND_FRAMEWORK=LAST \
-            -DCMAKE_INSTALL_PREFIX=../build/macos/ \
-            -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE \
-            -DENABLE_SYSTEM_JSONCPP=OFF
-          cmake --build . -j$(sysctl -n hw.logicalcpu)
-          make install
-
-      - name: Build and Archive with Xcode
-        run: |
-          mkdir build_xcode
-          cd build_xcode
-          ../util/ci/build_xcode.sh
-
-      - name: Tests
-        run: |
-          mkdir -p "${HOME}/Library/Application Support/minetest/games/"
-          ln -s "${PWD}/games/devtest" "${HOME}/Library/Application Support/minetest/games/"
-          ./build/macos/luanti.app/Contents/MacOS/luanti --run-unittests
-          ./build_xcode/luanti.xcarchive/Products/Applications/luanti.app/Contents/MacOS/luanti --run-unittests
-
-      - name: Diff Resources
-        run: |
-          diff -rd ./build/macos/luanti.app/Contents/Resources ./build_xcode/build/Release/luanti.app/Contents/Resources || exit 1
-          diff -rd ./build/macos/luanti.app/Contents/Resources ./build_xcode/luanti.xcarchive/Products/Applications/luanti.app/Contents/Resources || exit 1
--- a/.github/workflows/png_file_checks.yml
+++ b/.github/workflows/png_file_checks.yml
@ -1,26 +0,0 @@
-name: png_file_checks
-
-# Check whether all png files are in a valid format
-on:
-  push:
-    paths:
-      - '**.png'
-      - '.github/workflows/**.yml'
-  pull_request:
-    paths:
-      - '**.png'
-      - '.github/workflows/**.yml'
-
-jobs:
-  png_optimized:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install deps
-        run: |
-          sudo apt-get update
-          sudo apt install -y optipng
-
-      - name: Check whether all png files are optimized
-        run: |
-          ./util/ci/check_png_optimized.sh
--- a/.github/workflows/whitespace_checks.yml
+++ b/.github/workflows/whitespace_checks.yml
@ -1,118 +0,0 @@
-name: whitespace_checks
-
-# Check whitespaces of the following file types
-# Not checked: .lua, .yml, .properties, .conf, .java, .py, .svg, .gradle, .xml, ...
-# (luacheck already checks .lua files)
-on:
-  push:
-    paths:
-      - '**.txt'
-      - '**.md'
-      - '**.[ch]'
-      - '**.cpp'
-      - '**.hpp'
-      - '**.sh'
-      - '**.cmake'
-      - '**.glsl'
-      - '**.lua'
-  pull_request:
-    paths:
-      - '**.txt'
-      - '**.md'
-      - '**.[ch]'
-      - '**.cpp'
-      - '**.hpp'
-      - '**.sh'
-      - '**.cmake'
-      - '**.glsl'
-      - '**.lua'
-
-jobs:
-  trailing_whitespaces:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # Line endings are already ensured by .gitattributes
-      - name: Check trailing whitespaces
-        run: |
-          if git ls-files |\
-            grep -E '\.txt$|\.md$|\.[ch]$|\.cpp$|\.hpp$|\.sh$|\.cmake$|\.glsl$' |\
-            xargs grep -n '\s$';\
-          then\
-            echo -e "\033[0;31mFound trailing whitespace";\
-            (exit 1);\
-          else\
-            (exit 0);\
-          fi
-
-  indent_spaces:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # Line endings are already ensured by .gitattributes
-      # Multiple multline comments in one line is not supported by this check 
-      # and there is no reason to use them
-      # So lines like: "/* */ /*" or "*/ a = 5; /*" will result in error
-      - name: Check for unsupported multiline comments
-        run: |
-          if git ls-files |\
-            grep -E '^src/.*\.cpp$|^src/.*\.[ch]$' |\
-            xargs grep -n '\*/.*/\*';\
-          then
-            echo -e "\033[0;31mUnsupported combination of multiline comments. New multiline comment should begin on new line.";\
-            (exit 1);\
-          else\
-            (exit 0);\
-          fi
-          if git ls-files |\
-            grep -E '\.lua$' |\
-            xargs grep -n -e '\]\].*--\[\[';\
-          then
-            echo -e "\033[0;31mUnsupported combination of multiline comments. New multiline comment should begin on new line.";\
-            (exit 1);\
-          else\
-            (exit 0);\
-          fi
-      # This prepare files for final check 
-      # See python script ./util/ci/indent_tab_preprocess.py for details.
-      - name: Preprocess files
-        run: |
-          git ls-files |\
-            grep -E '^src/.*\.cpp$|^src/.*\.[ch]$' |\
-            xargs -L 1 -P $(($(nproc) + 1)) \
-              python3 ./util/ci/indent_tab_preprocess.py "/*" "*/"
-          git ls-files |\
-            grep -E '\.lua$' |\
-            xargs -L 1 -P $(($(nproc) + 1)) \
-              python3 ./util/ci/indent_tab_preprocess.py "--[[" "]]"
-      # Check for bad indent.
-      # This runs over preprocessed files.
-      # If there is any remaining space on line beginning or after tab,
-      # error is generated
-      - name: Check indent spaces
-        run: |
-          if git ls-files |\
-            grep -E '^src/.*\.cpp$|^src/.*\.[ch]$|\.lua' |\
-            xargs grep -n -P '^\t*[ ]';\
-          then\
-            echo -e "\033[0;31mFound incorrect indent whitespaces";\
-            (exit 1);\
-          else\
-            (exit 0);\
-          fi
-
-  tabs_lua_api_files:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # Some files should not contain tabs
-      - name: Check tabs in Lua API files
-        run: |
-          if grep -n $'\t' doc/lua_api.md doc/client_lua_api.md;\
-          then\
-            echo -e "\033[0;31mFound tab in markdown file";\
-            (exit 1);\
-          else\
-            (exit 0);\
-          fi
-
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -12,7 +12,6 @@ on:
      - 'irr/**.cpp'
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - 'util/buildbot/**'
      - 'misc/*.manifest'
      - '.github/workflows/windows.yml'
@ -26,7 +25,6 @@ on:
      - 'irr/**.cpp'
      - '**/CMakeLists.txt'
      - 'cmake/Modules/**'
-      - 'po/**.po'
      - 'util/buildbot/**'
      - 'misc/*.manifest'
      - '.github/workflows/windows.yml'
@ -58,8 +56,8 @@ jobs:
        run: |
          dest=$(mktemp -d)
          unzip -q -d "$dest" B/build/*.zip
-          cd "$dest"/luanti-*-win*
-          wine bin/luanti.exe --version
+          cd "$dest"/minetest-*-win*
+          wine bin/minetest.exe --version

      - uses: actions/upload-artifact@v4
        with:
@ -73,7 +71,7 @@ jobs:
    env:
      VCPKG_VERSION: 01f602195983451bc83e72f4214af2cbc495aa94
      # 2024.05.24
-      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp sdl2
+      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
    strategy:
      fail-fast: false
      matrix:
@ -105,7 +103,7 @@ jobs:
          vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
          vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}

-      - name: CMake
+      - name: Minetest CMake
        run: |
          cmake ${{matrix.config.generator}}  `
          -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake"  `
@ -115,13 +113,13 @@ jobs:
          -DREQUIRE_LUAJIT=TRUE  `
          -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .

-      - name: Build
+      - name: Build Minetest
        run: cmake --build . --config Release

      - name: Unittests
        # need this workaround for stdout to work
        run: |
-          $proc = start .\bin\Release\luanti.exe --run-unittests -NoNewWindow -Wait -PassThru
+          $proc = start .\bin\Release\minetest.exe --run-unittests -NoNewWindow -Wait -PassThru
          exit $proc.ExitCode
        continue-on-error: true # FIXME!!

--- a/.gitignore
+++ b/.gitignore
@ -26,7 +26,6 @@ tags
 !tags/
 gtags.files
 .idea
-.qtcreator/
 # Codelite
 *.project
 # Visual Studio Code & plugins
@ -44,18 +43,14 @@ build/.cmake/
 *.zsync
 appimage-build
 AppDir
-# Direnv
-.direnv/
-# Nix
-/result

-## Files related to Luanti development cycle
+## Files related to Minetest development cycle
 /*.patch
 *.diff
 # GNU Patch reject file
 *.rej

-## Non-static Luanti directories or symlinks to these
+## Non-static Minetest directories or symlinks to these
 /bin/
 /games/*
 !/games/devtest/
@ -80,7 +75,7 @@ minetest.conf
 debug.txt
 debug.txt.1

-## Other files generated by Luanti
+## Other files generated by Minetest
 screenshot_*.png
 testbm.txt

@ -110,8 +105,6 @@ src/cmake_config_githash.h
 *.layout
 *.o
 *.a
-*.dump
-*.dmp
 *.ninja
 .ninja*
 *.gch
--- a/.luacheckrc
+++ b/.luacheckrc
@ -10,19 +10,17 @@ ignore = {
 read_globals = {
 	"ItemStack",
 	"INIT",
-	"PLATFORM",
 	"DIR_DELIM",
 	"dump", "dump2",
 	"fgettext", "fgettext_ne",
 	"vector",
 	"VoxelArea",
-	"VoxelManip",
 	"profiler",
 	"Settings",
 	"PerlinNoise", "PerlinNoiseMap",

 	string = {fields = {"split", "trim"}},
-	table  = {fields = {"copy", "getn", "indexof", "keyof", "insert_all"}},
+	table  = {fields = {"copy", "getn", "indexof", "insert_all"}},
 	math   = {fields = {"hypot", "round"}},
 }

@ -39,12 +37,6 @@ files["builtin/client/register.lua"] = {
 	}
 }

-files["builtin/common/math.lua"] = {
-	globals = {
-		"math",
-	},
-}
-
 files["builtin/common/misc_helpers.lua"] = {
 	globals = {
 		"dump", "dump2", "table", "math", "string",
@ -54,7 +46,7 @@ files["builtin/common/misc_helpers.lua"] = {
 }

 files["builtin/common/vector.lua"] = {
-	globals = { "vector", "math" },
+	globals = { "vector" },
 }

 files["builtin/game/voxelarea.lua"] = {
@ -76,6 +68,10 @@ files["builtin/mainmenu"] = {
 	globals = {
 		"gamedata",
 	},
+
+	read_globals = {
+		"PLATFORM",
+	},
 }

 files["builtin/common/tests"] = {
--- a/.mailmap
+++ b/.mailmap
@ -72,4 +72,3 @@ Lars Müller <appgurulars@gmx.de>
 Lars Müller <appgurulars@gmx.de> <34514239+appgurueu@users.noreply.github.com>
 ROllerozxa <rollerozxa@voxelmanip.se>
 ROllerozxa <rollerozxa@voxelmanip.se> <temporaryemail4meh+github@gmail.com>
-Ælla Chiana Moskopp <erle@dieweltistgarnichtso.net> <nils@dieweltistgarnichtso.net>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.12)

 # This can be read from ${PROJECT_NAME} after project() is called
-project(luanti)
-set(PROJECT_NAME_CAPITALIZED "Luanti")
+project(minetest)
+set(PROJECT_NAME_CAPITALIZED "Minetest")

 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
@ -11,12 +11,12 @@ set(CLANG_MINIMUM_VERSION "7.0.1")

 # You should not need to edit these manually, use util/bump_version.sh
 set(VERSION_MAJOR 5)
-set(VERSION_MINOR 12)
+set(VERSION_MINOR 9)
 set(VERSION_PATCH 0)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")

 # Change to false for releases
-set(DEVELOPMENT_BUILD TRUE)
+set(DEVELOPMENT_BUILD FALSE)

 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 if(VERSION_EXTRA)
@ -48,7 +48,7 @@ endif()
 # - win32/gcc: fails to link
 # - win32/clang: works
 # - macOS on x86: seems to be fine
-# - macOS on ARM: crashes, see <https://github.com/luanti-org/luanti/issues/14397>
+# - macOS on ARM: crashes, see <https://github.com/minetest/minetest/issues/14397>
 # Note: since CMake has no easy architecture detection disabling for Mac entirely
 #### ####
 if((WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR APPLE)
@ -56,11 +56,6 @@ if((WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR APPLE)
 endif()
 set(ENABLE_LTO ${DEFAULT_ENABLE_LTO} CACHE BOOL "Use Link Time Optimization")

-set(BUILD_WITH_TRACY FALSE CACHE BOOL
-	"Fetch and build with the Tracy profiler client")
-set(FETCH_TRACY_GIT_TAG "master" CACHE STRING
-	"Git tag for fetching Tracy client. Match with your server (gui) version")
-
 set(DEFAULT_RUN_IN_PLACE FALSE)
 if(WIN32)
 	set(DEFAULT_RUN_IN_PLACE TRUE)
@ -92,7 +87,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 # Load default options for Android
 if(ANDROID)
 	cmake_minimum_required(VERSION 3.20)
-	include(AndroidLibs)
+	include(MinetestAndroidLibs)
 endif()


@ -261,27 +256,23 @@ install(FILES "doc/world_format.md" DESTINATION "${DOCDIR}" COMPONENT "Docs")
 install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")

 if(UNIX AND NOT APPLE)
-	install(FILES "doc/luanti.6" "doc/luantiserver.6" DESTINATION "${MANDIR}/man6")
+	install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6")
 	install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
 	install(FILES "misc/net.minetest.minetest.metainfo.xml" DESTINATION "${METAINFODIR}")
-	install(FILES "misc/luanti.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
-	install(FILES "misc/luanti-xorg-icon-128.png"
+	install(FILES "misc/minetest.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
+	install(FILES "misc/minetest-xorg-icon-128.png"
 		DESTINATION "${ICONDIR}/hicolor/128x128/apps"
-		RENAME "luanti.png")
+		RENAME "minetest.png")
 endif()

 if(APPLE)
-	install(FILES "misc/luanti-icon.icns" DESTINATION "${SHAREDIR}")
-	install(FILES "${CMAKE_BINARY_DIR}/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents")
-endif()
-
-if(CMAKE_GENERATOR STREQUAL "Xcode")
-	set(client_RESOURCES "${CMAKE_SOURCE_DIR}/misc/luanti-icon.icns")
+	install(FILES "misc/minetest-icon.icns" DESTINATION "${SHAREDIR}")
+	install(FILES "misc/Info.plist" DESTINATION "${BUNDLE_PATH}/Contents")
 endif()

 # Library pack
 find_package(GMP REQUIRED)
-find_package(Json 1.0.0 REQUIRED)
+find_package(Json REQUIRED)
 find_package(Lua REQUIRED)
 if(NOT USE_LUAJIT)
 	add_subdirectory(lib/bitop)
@ -292,8 +283,6 @@ if(BUILD_UNITTESTS OR BUILD_BENCHMARKS)
 	add_subdirectory(lib/catch2)
 endif()

-add_subdirectory(lib/tiniergltf)
-
 # Subdirectories
 # Be sure to add all relevant definitions above this
 add_subdirectory(src)
@ -311,7 +300,7 @@ include(CPackComponent)

 cpack_add_component(Docs
 	DISPLAY_NAME "Documentation"
-	DESCRIPTION "Documentation about ${PROJECT_NAME_CAPITALIZED} and ${PROJECT_NAME_CAPITALIZED} modding"
+	DESCRIPTION "Documentation about Minetest and Minetest modding"
 )

 if(WIN32)
@ -335,7 +324,7 @@ if(WIN32)
 		set(CPACK_CREATE_DESKTOP_LINKS ${PROJECT_NAME})
 		set(CPACK_PACKAGING_INSTALL_PREFIX "/${PROJECT_NAME_CAPITALIZED}")

-		set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/luanti-icon.ico")
+		set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.ico")
 		# Supported languages can be found at
 		# http://wixtoolset.org/documentation/manual/v3/wixui/wixui_localization.html
 		#set(CPACK_WIX_CULTURES "ar-SA,bg-BG,ca-ES,hr-HR,cs-CZ,da-DK,nl-NL,en-US,et-EE,fi-FI,fr-FR,de-DE")
@ -379,19 +368,3 @@ if(BUILD_DOCUMENTATION)
 		)
 	endif()
 endif()
-
-# Fetch Tracy
-if(BUILD_WITH_TRACY)
-	include(FetchContent)
-
-	message(STATUS "Fetching Tracy (${FETCH_TRACY_GIT_TAG})...")
-	FetchContent_Declare(
-		tracy
-		GIT_REPOSITORY https://github.com/wolfpld/tracy.git
-		GIT_TAG ${FETCH_TRACY_GIT_TAG}
-		GIT_SHALLOW TRUE
-		GIT_PROGRESS TRUE
-	)
-	FetchContent_MakeAvailable(tracy)
-	message(STATUS "Fetching Tracy - done")
-endif()
--- a/2
+++ b/2
@ -1 +1 @@
-api.luanti.org
+api.minetest.net
--- a/38
+++ b/38
@ -32,22 +32,22 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp && \

 FROM dev as builder

-COPY .git /usr/src/luanti/.git
-COPY CMakeLists.txt /usr/src/luanti/CMakeLists.txt
-COPY README.md /usr/src/luanti/README.md
-COPY minetest.conf.example /usr/src/luanti/minetest.conf.example
-COPY builtin /usr/src/luanti/builtin
-COPY cmake /usr/src/luanti/cmake
-COPY doc /usr/src/luanti/doc
-COPY fonts /usr/src/luanti/fonts
-COPY lib /usr/src/luanti/lib
-COPY misc /usr/src/luanti/misc
-COPY po /usr/src/luanti/po
-COPY src /usr/src/luanti/src
-COPY irr /usr/src/luanti/irr
-COPY textures /usr/src/luanti/textures
+COPY .git /usr/src/minetest/.git
+COPY CMakeLists.txt /usr/src/minetest/CMakeLists.txt
+COPY README.md /usr/src/minetest/README.md
+COPY minetest.conf.example /usr/src/minetest/minetest.conf.example
+COPY builtin /usr/src/minetest/builtin
+COPY cmake /usr/src/minetest/cmake
+COPY doc /usr/src/minetest/doc
+COPY fonts /usr/src/minetest/fonts
+COPY lib /usr/src/minetest/lib
+COPY misc /usr/src/minetest/misc
+COPY po /usr/src/minetest/po
+COPY src /usr/src/minetest/src
+COPY irr /usr/src/minetest/irr
+COPY textures /usr/src/minetest/textures

-WORKDIR /usr/src/luanti
+WORKDIR /usr/src/minetest
 RUN cmake -B build \
 		-DCMAKE_INSTALL_PREFIX=/usr/local \
 		-DCMAKE_BUILD_TYPE=Release \
@ -68,9 +68,9 @@ RUN apk add --no-cache curl gmp libstdc++ libgcc libpq jsoncpp zstd-libs \

 WORKDIR /var/lib/minetest

-COPY --from=builder /usr/local/share/luanti /usr/local/share/luanti
-COPY --from=builder /usr/local/bin/luantiserver /usr/local/bin/luantiserver
-COPY --from=builder /usr/local/share/doc/luanti/minetest.conf.example /etc/minetest/minetest.conf
+COPY --from=builder /usr/local/share/minetest /usr/local/share/minetest
+COPY --from=builder /usr/local/bin/minetestserver /usr/local/bin/minetestserver
+COPY --from=builder /usr/local/share/doc/minetest/minetest.conf.example /etc/minetest/minetest.conf
 COPY --from=builder /usr/local/lib/libspatialindex* /usr/local/lib/
 COPY --from=builder /usr/local/lib/libluajit* /usr/local/lib/
 USER minetest:minetest
@ -78,5 +78,5 @@ USER minetest:minetest
 EXPOSE 30000/udp 30000/tcp
 VOLUME /var/lib/minetest/ /etc/minetest/

-ENTRYPOINT ["/usr/local/bin/luantiserver"]
+ENTRYPOINT ["/usr/local/bin/minetestserver"]
 CMD ["--config", "/etc/minetest/minetest.conf"]
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,8 +1,8 @@

-License of Luanti textures and sounds
+License of Minetest textures and sounds
 ---------------------------------------

-This applies to textures and sounds contained in the main Luanti
+This applies to textures and sounds contained in the main Minetest
 distribution.

 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
@ -14,9 +14,6 @@ https://www.apache.org/licenses/LICENSE-2.0.html
 Textures by Zughy are under CC BY-SA 4.0
 https://creativecommons.org/licenses/by-sa/4.0/

-Textures by cx384 are under CC BY-SA 4.0
-https://creativecommons.org/licenses/by-sa/4.0/
-
 Media files by DS are under CC BY-SA 4.0
 https://creativecommons.org/licenses/by-sa/4.0/

@ -32,6 +29,7 @@ ShadowNinja:
  textures/base/pack/smoke_puff.png

 paramat:
+  textures/base/pack/menu_header.png
  textures/base/pack/next_icon.png
  textures/base/pack/prev_icon.png
  textures/base/pack/clear.png
@ -41,10 +39,10 @@ rubenwardy, paramat:
  textures/base/pack/start_icon.png
  textures/base/pack/end_icon.png

-erle:
-  misc/luanti-icon-24x24.png
-  misc/luanti-icon.ico
-  misc/luanti.svg
+erlehmann:
+  misc/minetest-icon-24x24.png
+  misc/minetest-icon.ico
+  misc/minetest.svg
  textures/base/pack/logo.png

 JRottm:
@ -59,26 +57,20 @@ srifqi:
  textures/base/pack/minimap_btn.png

 Zughy:
+  textures/base/pack/cdb_add.png
  textures/base/pack/cdb_downloading.png
  textures/base/pack/cdb_queued.png
  textures/base/pack/cdb_update.png
  textures/base/pack/cdb_update_cropped.png
+  textures/base/pack/cdb_viewonline.png
  textures/base/pack/settings_btn.png
  textures/base/pack/settings_info.png
  textures/base/pack/settings_reset.png
-  textures/base/pack/server_url.png
-  textures/base/pack/server_url_unavailable.png
-  textures/base/pack/server_view_clients.png
-  textures/base/pack/server_view_clients_unavailable.png
-
-cx384:
-  textures/base/pack/server_view_mods.png
-  textures/base/pack/server_view_mods_unavailable.png

 appgurueu:
  textures/base/pack/server_incompatible.png

-erle, Warr1024, rollerozxa:
+erlehmann, Warr1024, rollerozxa:
  textures/base/pack/no_screenshot.png

 kilbith:
@ -87,6 +79,7 @@ kilbith:
  textures/base/pack/progress_bar_bg.png

 SmallJoker:
+  textures/base/pack/cdb_clear.png
  textures/base/pack/server_favorite_delete.png (based on server_favorite.png)

 DS:
@ -98,17 +91,12 @@ DS:

 grorp:
  textures/base/pack/exit_btn.png
-  textures/base/pack/menu_header.png
-    using the font "undefined medium" (https://undefined-medium.com/),
-    which is licensed under the SIL Open Font License, Version 1.1
-    modified by DS

-License of Luanti source code
+License of Minetest source code
 -------------------------------

-Luanti
-Copyright (C) 2010-2024 celeron55, Perttu Ahola <celeron55@gmail.com>
-and contributors (see source file comments and the version control log)
+Minetest
+Copyright (C) 2010-2018 celeron55, Perttu Ahola <celeron55@gmail.com>

 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@ -127,7 +115,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 Irrlicht
 ---------------

-This program uses IrrlichtMt, Luanti's fork of
+This program uses IrrlichtMt, Minetest's fork of
 the Irrlicht Engine. http://irrlicht.sourceforge.net/

 The Irrlicht Engine License
--- a/README.md
+++ b/README.md
@ -1,15 +1,13 @@
-<div align="center">
-    <img src="textures/base/pack/logo.png" width="32%">
-    <h1>Luanti (formerly Minetest)</h1>
-    <img src="https://github.com/luanti-org/luanti/workflows/build/badge.svg" alt="Build Status">
-    <a href="https://hosted.weblate.org/engage/minetest/?utm_source=widget"><img src="https://hosted.weblate.org/widgets/minetest/-/svg-badge.svg" alt="Translation status"></a>
-    <a href="https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html"><img src="https://img.shields.io/badge/license-LGPLv2.1%2B-blue.svg" alt="License"></a>
-</div>
-<br><br>
+Minetest
+========

-Luanti is a free open-source voxel game engine with easy modding and game creation.
+![Build Status](https://github.com/minetest/minetest/workflows/build/badge.svg)
+[![Translation status](https://hosted.weblate.org/widgets/minetest/-/svg-badge.svg)](https://hosted.weblate.org/engage/minetest/?utm_source=widget)
+[![License](https://img.shields.io/badge/license-LGPLv2.1%2B-blue.svg)](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html)

-Copyright (C) 2010-2025 Perttu Ahola <celeron55@gmail.com>
+Minetest is a free open-source voxel game engine with easy modding and game creation.
+
+Copyright (C) 2010-2022 Perttu Ahola <celeron55@gmail.com>
 and contributors (see source file comments and the version control log)

 Table of Contents
@ -27,10 +25,10 @@ Table of Contents

 Further documentation
 ----------------------
- Website: https://www.luanti.org/
- Wiki: https://wiki.luanti.org/
- Forum: https://forum.luanti.org/
- GitHub: https://github.com/luanti-org/luanti/
+- Website: https://www.minetest.net/
+- Wiki: https://wiki.minetest.net/
+- Forum: https://forum.minetest.net/
+- GitHub: https://github.com/minetest/minetest/
 - [Developer documentation](doc/developing/)
 - [doc/](doc/) directory of source distribution

@ -108,7 +106,7 @@ Configuration file
 ------------------
 - Default location:
    `user/minetest.conf`
- This file is created by closing Luanti for the first time.
+- This file is created by closing Minetest for the first time.
 - A specific file can be specified on the command line:
    `--config <path-to-file>`
 - A run-in-place build will look for the configuration file in
@ -121,7 +119,6 @@ Command-line options
 Compiling
 ---------

- [Compiling - common information](doc/compiling/README.md)
 - [Compiling on GNU/Linux](doc/compiling/linux.md)
 - [Compiling on Windows](doc/compiling/windows.md)
 - [Compiling on MacOS](doc/compiling/macos.md)
--- a/android/SDL_Java_RMB_fix.patch
+++ b/android/SDL_Java_RMB_fix.patch
@ -1,4 +1,5 @@
 diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+index fd5a056e3..83e3cf657 100644
 --- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
 +++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -1345,7 +1345,12 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
@ -8,7 +9,7 @@ diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android
 -        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
 +        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE ||
 +                /*
-+                 * CUSTOM ADDITION FOR LUANTI
+                 * CUSTOM ADDITION FOR MINETEST
 +                 * should be upstreamed
 +                 */
 +                (source & InputDevice.SOURCE_MOUSE_RELATIVE) == InputDevice.SOURCE_MOUSE_RELATIVE) {
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -8,7 +8,7 @@ android {
 		compileSdk 34
 		targetSdkVersion 34
 		versionName "${versionMajor}.${versionMinor}.${versionPatch}"
-		versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
+		versionCode project.versionCode
 	}

 	buildFeatures {
@ -95,7 +95,7 @@ task prepareAssets() {
 			def moPath = "${assetsFolder}/locale/${poFile.parentFile.name}/LC_MESSAGES/"
 			file(moPath).mkdirs()
 			exec {
-				commandLine 'msgfmt', '-o', "${moPath}/luanti.mo", poFile
+				commandLine 'msgfmt', '-o', "${moPath}/minetest.mo", poFile
 			}
 		}

@ -103,7 +103,7 @@ task prepareAssets() {
 	}

 	task zipAssets(dependsOn: prepareAssets, type: Zip) {
-		archiveFileName = "assets.zip"
+		archiveFileName = "Minetest.zip"
 		from assetsFolder
 		destinationDirectory = file("src/main/assets")
 	}
@ -113,7 +113,19 @@ preBuild.dependsOn zipAssets
 prepareAssets.dependsOn ':native:getDeps'

 clean {
-	delete new File("src/main/assets", "assets.zip")
+	delete new File("src/main/assets", "Minetest.zip")
+}
+
+// Map for the version code that gives each ABI a value.
+import com.android.build.OutputFile
+
+def abiCodes = ['armeabi-v7a': 0, 'arm64-v8a': 1]
+android.applicationVariants.all { variant ->
+	variant.outputs.each {
+		output ->
+			def abiName = output.getFilter(OutputFile.ABI)
+			output.versionCodeOverride = abiCodes.get(abiName, 0) + variant.versionCode
+	}
 }

 dependencies {
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -43,6 +43,9 @@
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 			</intent-filter>
+			<meta-data
+				android:name="android.app.lib_name"
+				android:value="minetest" />
 		</activity>

 		<service
--- a/android/app/src/main/java/net/minetest/minetest/GameActivity.java
+++ b/android/app/src/main/java/net/minetest/minetest/GameActivity.java
@ -52,7 +52,7 @@ import java.util.Objects;
 public class GameActivity extends SDLActivity {
 	@Override
 	protected String getMainSharedObject() {
-		return getContext().getApplicationInfo().nativeLibraryDir + "/libluanti.so";
+		return getContext().getApplicationInfo().nativeLibraryDir + "/libminetest.so";
 	}

 	@Override
@ -63,7 +63,7 @@ public class GameActivity extends SDLActivity {
 	@Override
 	protected String[] getLibraries() {
 		return new String[] {
-			"luanti"
+			"minetest"
 		};
 	}

--- a/android/app/src/main/java/net/minetest/minetest/UnzipService.java
+++ b/android/app/src/main/java/net/minetest/minetest/UnzipService.java
@ -73,7 +73,7 @@ public class UnzipService extends IntentService {
 	@Override
 	protected void onHandleIntent(Intent intent) {
 		Notification.Builder notificationBuilder = createNotification();
-		final File zipFile = new File(getCacheDir(), "assets.zip");
+		final File zipFile = new File(getCacheDir(), "Minetest.zip");
 		try {
 			setIsRunning(true);
 			File userDataDirectory = Utils.getUserDataDirectory(this);
--- a/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/android/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@ -277,7 +277,6 @@ public class HIDDeviceManager {
            0x044f, // Thrustmaster
            0x045e, // Microsoft
            0x0738, // Mad Catz
-            0x0b05, // ASUS
            0x0e6f, // PDP
            0x0f0d, // Hori
            0x10f5, // Turtle Beach
@ -591,13 +590,7 @@ public class HIDDeviceManager {
                } else {
                    flags = 0;
                }
-                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
-                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
-                   intent.setPackage(mContext.getPackageName());
-                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
-               } else {
-                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
-               }
+                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
            } catch (Exception e) {
                Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                HIDDeviceOpenResult(deviceID, false);
--- a/android/app/src/main/java/org/libsdl/app/SDL.java
+++ b/android/app/src/main/java/org/libsdl/app/SDL.java
@ -38,10 +38,6 @@ public class SDL {
    }

    public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
-        loadLibrary(libraryName, mContext);
-    }
-
-    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {

        if (libraryName == null) {
            throw new NullPointerException("No library name provided.");
@ -57,10 +53,10 @@ public class SDL {
            // To use ReLinker, just add it as a dependency.  For more information, see 
            // https://github.com/KeepSafe/ReLinker for ReLinker's repository.
            //
-            Class<?> relinkClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
-            Class<?> relinkListenerClass = context.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
-            Class<?> contextClass = context.getClassLoader().loadClass("android.content.Context");
-            Class<?> stringClass = context.getClassLoader().loadClass("java.lang.String");
+            Class<?> relinkClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker");
+            Class<?> relinkListenerClass = mContext.getClassLoader().loadClass("com.getkeepsafe.relinker.ReLinker$LoadListener");
+            Class<?> contextClass = mContext.getClassLoader().loadClass("android.content.Context");
+            Class<?> stringClass = mContext.getClassLoader().loadClass("java.lang.String");

            // Get a 'force' instance of the ReLinker, so we can ensure libraries are reinstalled if 
            // they've changed during updates.
@ -70,7 +66,7 @@ public class SDL {

            // Actually load the library!
            Method loadMethod = relinkInstanceClass.getDeclaredMethod("loadLibrary", contextClass, stringClass, stringClass, relinkListenerClass);
-            loadMethod.invoke(relinkInstance, context, libraryName, null, null);
+            loadMethod.invoke(relinkInstance, mContext, libraryName, null, null);
        }
        catch (final Throwable e) {
            // Fall back
--- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
@ -60,8 +60,8 @@ import java.util.Locale;
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 32;
-    private static final int SDL_MICRO_VERSION = 0;
+    private static final int SDL_MINOR_VERSION = 30;
+    private static final int SDL_MICRO_VERSION = 1;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
@ -89,7 +89,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                | InputDevice.SOURCE_CLASS_POSITION
                | InputDevice.SOURCE_CLASS_TRACKBALL);

-        if (s2 != 0) cls += "Some_Unknown";
+        if (s2 != 0) cls += "Some_Unkown";

        s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;

@ -163,7 +163,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        if (s == FLAG_TAINTED) src += " FLAG_TAINTED";
        s2 &= ~FLAG_TAINTED;

-        if (s2 != 0) src += " Some_Unknown";
+        if (s2 != 0) src += " Some_Unkown";

        Log.v(TAG, prefix + "int=" + s_copy + " CLASS={" + cls + " } source(s):" + src);
    }
@ -281,7 +281,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    // Load the .so
    public void loadLibraries() {
       for (String lib : getLibraries()) {
-          SDL.loadLibrary(lib, this);
+          SDL.loadLibrary(lib);
       }
    }

@ -790,9 +790,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                                window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
                                SDLActivity.mFullscreenModeActive = false;
                            }
-                            if (Build.VERSION.SDK_INT >= 28 /* Android 9 (Pie) */) {
-                                window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-                            }
                        }
                    } else {
                        Log.e(TAG, "error handling message, getContext() returned no Activity");
@ -998,8 +995,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        /* No valid hint, nothing is explicitly allowed */
        if (!is_portrait_allowed && !is_landscape_allowed) {
            if (resizable) {
-                /* All orientations are allowed, respecting user orientation lock setting */
-                req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
+                /* All orientations are allowed */
+                req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
            } else {
                /* Fixed window and nothing specified. Get orientation from w/h of created window */
                req = (w > h ? ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
@ -1008,8 +1005,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            /* At least one orientation is allowed */
            if (resizable) {
                if (is_portrait_allowed && is_landscape_allowed) {
-                    /* hint allows both landscape and portrait, promote to full user */
-                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_USER;
+                    /* hint allows both landscape and portrait, promote to full sensor */
+                    req = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
                } else {
                    /* Use the only one allowed "orientation" */
                    req = (is_landscape_allowed ? orientation_landscape : orientation_portrait);
@ -1350,7 +1347,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh

        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE ||
                /*
-                 * CUSTOM ADDITION FOR LUANTI
+                 * CUSTOM ADDITION FOR MINETEST
                 * should be upstreamed
                 */
                (source & InputDevice.SOURCE_MOUSE_RELATIVE) == InputDevice.SOURCE_MOUSE_RELATIVE) {
--- a/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+++ b/android/app/src/main/java/org/libsdl/app/SDLControllerManager.java
@ -546,15 +546,13 @@ class SDLHapticHandler {
            if (haptic == null) {
                InputDevice device = InputDevice.getDevice(deviceIds[i]);
                Vibrator vib = device.getVibrator();
-                if (vib != null) {
-                    if (vib.hasVibrator()) {
-                        haptic = new SDLHaptic();
-                        haptic.device_id = deviceIds[i];
-                        haptic.name = device.getName();
-                        haptic.vib = vib;
-                        mHaptics.add(haptic);
-                        SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
-                    }
+                if (vib.hasVibrator()) {
+                    haptic = new SDLHaptic();
+                    haptic.device_id = deviceIds[i];
+                    haptic.name = device.getName();
+                    haptic.vib = vib;
+                    mHaptics.add(haptic);
+                    SDLControllerManager.nativeAddHaptic(haptic.device_id, haptic.name);
                }
            }
        }
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="loading">Lädt…</string>
-    <string name="unzip_notification_title">Luanti lädt</string>
-    <string name="unzip_notification_description">Weniger als 1 Minute…</string>
-    <string name="ime_dialog_done">Fertig</string>
-    <string name="no_web_browser">Kein Web-Browser gefunden</string>
-    <string name="notification_channel_name">Allgemeine Benachrichtigung</string>
-    <string name="notification_channel_description">Benachrichtigungen von Luanti</string>
-</resources>
--- a/android/app/src/main/res/values-es-rUS/strings.xml
+++ b/android/app/src/main/res/values-es-rUS/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="unzip_notification_description">Menos de 1 minuto…</string>
-    <string name="ime_dialog_done">Hecho</string>
-    <string name="no_web_browser">No se encontró ningún navegador web</string>
-    <string name="loading">Cargando…</string>
-    <string name="notification_channel_name">Notificación General</string>
-    <string name="label">Luanti</string>
-    <string name="notification_channel_description">Notificaciones de Luanti</string>
-    <string name="unzip_notification_title">Cargando Luanti</string>
-</resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="no_web_browser">No se encontró ningún navegador web</string>
-    <string name="loading">Cargando…</string>
-    <string name="notification_channel_description">Notificaciones de Luanti</string>
-    <string name="unzip_notification_description">Menos de 1 minuto…</string>
-    <string name="ime_dialog_done">Hecho</string>
-    <string name="label">Luanti</string>
-    <string name="unzip_notification_title">Cargando Luanti</string>
-    <string name="notification_channel_name">Notificación General</string>
-</resources>
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="unzip_notification_description">کمتر از 1 دقیقه…</string>
-    <string name="loading">در حال بارگذاری…</string>
-    <string name="ime_dialog_done">انجام شد</string>
-    <string name="label">لوآنتی</string>
-    <string name="unzip_notification_title">در حال بارگذاری لوآنتی</string>
-    <string name="notification_channel_name">نوتیفیکیشن عمومی</string>
-    <string name="notification_channel_description">نوتیفیکیشن از لوآنتی</string>
-    <string name="no_web_browser">هیچ مرورگری یافت نشد</string>
-</resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="loading">Chargement…</string>
-    <string name="notification_channel_name">Notification générale</string>
-    <string name="notification_channel_description">Notifications de Luanti</string>
-    <string name="unzip_notification_title">Chargement de Luanti</string>
-    <string name="unzip_notification_description">Moins d\'une minute…</string>
-    <string name="ime_dialog_done">Terminé</string>
-    <string name="no_web_browser">Aucun navigateur web trouvé</string>
-</resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="loading">Cargando…</string>
-    <string name="notification_channel_name">Notificación xeral</string>
-    <string name="notification_channel_description">Notificacións de Luanti</string>
-    <string name="unzip_notification_title">Cargando Luanti</string>
-    <string name="unzip_notification_description">Menos de 1 minuto…</string>
-    <string name="ime_dialog_done">Feito</string>
-    <string name="no_web_browser">Non se atopou ningún navegador web</string>
-</resources>
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="loading">Betöltés…</string>
-    <string name="notification_channel_name">Általános értesítés</string>
-    <string name="notification_channel_description">Értesítések a Luanti-től</string>
-    <string name="unzip_notification_title">Luanti betöltése…</string>
-    <string name="ime_dialog_done">Kész</string>
-    <string name="no_web_browser">Nem található webböngésző</string>
-    <string name="label">Luanti</string>
-    <string name="unzip_notification_description">Kevesebb, mint 1 perc…</string>
-</resources>
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="no_web_browser">Tidak ditemukan peramban web</string>
-    <string name="ime_dialog_done">Selesai</string>
-    <string name="label">Luanti</string>
-    <string name="loading">Memuat…</string>
-    <string name="notification_channel_name">Pemberitahuan umum</string>
-    <string name="unzip_notification_description">Kurang dari 1 menit…</string>
-    <string name="notification_channel_description">Pemberitahuan dari Luanti</string>
-    <string name="unzip_notification_title">Memuat Luanti…</string>
-</resources>
--- a/android/app/src/main/res/values-ms/strings.xml
+++ b/android/app/src/main/res/values-ms/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="notification_channel_description">Pemberitahuan dari Luanti</string>
-    <string name="unzip_notification_title">Memuatkan Luanti…</string>
-    <string name="unzip_notification_description">Kurang dari 1 minit…</string>
-    <string name="no_web_browser">Tiada pelayar sesawang dijumpai</string>
-    <string name="loading">Memuatkan…</string>
-    <string name="notification_channel_name">Pemberitahuan umum</string>
-    <string name="ime_dialog_done">Selesai</string>
-</resources>
--- a/android/app/src/main/res/values-nb-rNO/strings.xml
+++ b/android/app/src/main/res/values-nb-rNO/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="loading">Laster inn …</string>
-    <string name="notification_channel_name">Generell merknad</string>
-    <string name="notification_channel_description">Merknader fra Luanti</string>
-    <string name="unzip_notification_description">Mindre enn ett minutt …</string>
-    <string name="ime_dialog_done">Ferdig</string>
-    <string name="no_web_browser">Fant ingen nettleser</string>
-    <string name="unzip_notification_title">Laster inn Luanti …</string>
-</resources>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="unzip_notification_title">Загрузка Luanti</string>
-    <string name="unzip_notification_description">Меньше чам за 1 минуту…</string>
-    <string name="ime_dialog_done">Готово</string>
-    <string name="label">Luаnti</string>
-    <string name="notification_channel_description">Уведомления от Luanti</string>
-    <string name="notification_channel_name">Основные уведомления</string>
-    <string name="loading">Загрузка…</string>
-    <string name="no_web_browser">Не найдено веб-браузера</string>
-</resources>
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="loading">Laddar…</string>
-    <string name="unzip_notification_description">Mindre än 1 minut…</string>
-    <string name="ime_dialog_done">Färdig</string>
-    <string name="no_web_browser">Ingen webbläsare kunde hittas</string>
-    <string name="notification_channel_name">Generell notis</string>
-    <string name="notification_channel_description">Notiser från Luanti</string>
-    <string name="unzip_notification_title">Laddar Luanti</string>
-</resources>
--- a/android/app/src/main/res/values-ta/strings.xml
+++ b/android/app/src/main/res/values-ta/strings.xml
@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="no_web_browser">Браузерів не знайдено</string>
-    <string name="loading">Завантаження…</string>
-    <string name="notification_channel_name">Загальні сповіщення</string>
-    <string name="unzip_notification_title">Luanti завантажується</string>
-    <string name="unzip_notification_description">Менше за 1 хвилину…</string>
-    <string name="ime_dialog_done">Готово</string>
-    <string name="notification_channel_description">Сповіщення від Luanti</string>
-</resources>
--- a/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="label">Luanti</string>
-    <string name="loading">加载中…</string>
-    <string name="notification_channel_name">一般通知</string>
-    <string name="notification_channel_description">Luanti 的通知</string>
-    <string name="unzip_notification_title">加载 Luanti 中</string>
-    <string name="unzip_notification_description">不到1分钟…</string>
-    <string name="ime_dialog_done">完成</string>
-    <string name="no_web_browser">未找到网页浏览器</string>
-</resources>
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="loading">載入中…</string>
-    <string name="notification_channel_name">一般通知</string>
-    <string name="notification_channel_description">Luanti 的通知</string>
-    <string name="unzip_notification_description">不到1分鐘…</string>
-    <string name="ime_dialog_done">完畢</string>
-    <string name="no_web_browser">未找到任何網頁瀏覽器</string>
-    <string name="label">Luanti</string>
-    <string name="unzip_notification_title">載入Luanti中</string>
-</resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="label">Luanti</string>
+	<string name="label">Minetest</string>
 	<string name="loading">Loading&#8230;</string>
 	<string name="notification_channel_name">General notification</string>
-	<string name="notification_channel_description">Notifications from Luanti</string>
-	<string name="unzip_notification_title">Loading Luanti</string>
+	<string name="notification_channel_description">Notifications from Minetest</string>
+	<string name="unzip_notification_title">Loading Minetest</string>
 	<string name="unzip_notification_description">Less than 1 minute&#8230;</string>
 	<string name="ime_dialog_done">Done</string>
 	<string name="no_web_browser">No web browser found</string>
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,15 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 project.ext.set("versionMajor", 5)      // Version Major
-project.ext.set("versionMinor", 12)     // Version Minor
+project.ext.set("versionMinor", 9)      // Version Minor
 project.ext.set("versionPatch", 0)      // Version Patch
 // ^ keep in sync with cmake
-
-project.ext.set("versionBuild", 0)      // Version Build
-// ^ fourth version number to allow releasing Android-only fixes and beta versions
+project.ext.set("versionCode", 48)      // Android Version Code
+// NOTE: +2 after each release!
+// +1 for ARM and +1 for ARM64 APK's, because
+// each APK must have a larger `versionCode` than the previous

 buildscript {
-	ext.ndk_version = '27.2.12479018'
+	ext.ndk_version = '26.2.11394342'
 	repositories {
 		google()
 		mavenCentral()
--- a/android/icons/gear_icon.svg
+++ b/android/icons/gear_icon.svg
@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   viewBox="0 0 135.46666 135.46667"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="gear_icon.svg"
+   inkscape:export-filename="/home/stu/Desktop/icons/png/gear_icon.png"
+   inkscape:export-xdpi="24"
+   inkscape:export-ydpi="24">
+  <defs
+     id="defs2">
+    <marker
+       style="overflow:visible"
+       refY="0.0"
+       refX="0.0"
+       orient="auto"
+       id="DistanceX">
+      <path
+         id="path4687"
+         style="stroke:#000000; stroke-width:0.5"
+         d="M 3,-3 L -3,3 M 0,-5 L  0,5" />
+    </marker>
+    <pattern
+       y="0"
+       x="0"
+       width="8"
+       patternUnits="userSpaceOnUse"
+       id="Hatch"
+       height="8">
+      <path
+         id="path4690"
+         stroke-width="0.25"
+         stroke="#000000"
+         linecap="square"
+         d="M8 4 l-4,4" />
+      <path
+         id="path4692"
+         stroke-width="0.25"
+         stroke="#000000"
+         linecap="square"
+         d="M6 2 l-4,4" />
+      <path
+         id="path4694"
+         stroke-width="0.25"
+         stroke="#000000"
+         linecap="square"
+         d="M4 0 l-4,4" />
+    </pattern>
+    <marker
+       style="overflow:visible"
+       refY="0.0"
+       refX="0.0"
+       orient="auto"
+       id="DistanceX-3">
+      <path
+         id="path4756"
+         style="stroke:#000000; stroke-width:0.5"
+         d="M 3,-3 L -3,3 M 0,-5 L  0,5" />
+    </marker>
+    <pattern
+       y="0"
+       x="0"
+       width="8"
+       patternUnits="userSpaceOnUse"
+       id="Hatch-6"
+       height="8">
+      <path
+         id="path4759"
+         stroke-width="0.25"
+         stroke="#000000"
+         linecap="square"
+         d="M8 4 l-4,4" />
+      <path
+         id="path4761"
+         stroke-width="0.25"
+         stroke="#000000"
+         linecap="square"
+         d="M6 2 l-4,4" />
+      <path
+         id="path4763"
+         stroke-width="0.25"
+         stroke="#000000"
+         linecap="square"
+         d="M4 0 l-4,4" />
+    </pattern>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.5"
+     inkscape:cx="-308.644"
+     inkscape:cy="171.10144"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1023"
+     inkscape:window-x="0"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-page="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-to-guides="false"
+     inkscape:showpageshadow="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid16"
+       spacingx="2.1166666"
+       spacingy="2.1166666"
+       empspacing="2"
+       color="#40ff40"
+       opacity="0.1254902"
+       empcolor="#40ff40"
+       empopacity="0.25098039" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-161.53332)">
+    <g
+       id="g4792"
+       transform="matrix(0.68725287,0,0,0.65623884,67.477909,-509.24679)"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.74041259;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+      <g
+         id="g4772"
+         inkscape:label="OpenJsCad"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.74041259;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 256,80.943359 -8.28125,0.72461 -3.63477,5.410156 -5.61328,12.685547 -2.28906,9.259768 -0.35156,5.1875 0.0937,0.86133 0.70703,2.44726 0.60547,9.80664 -2.66602,5.47461 -21.5957,5.78711 -5.04492,-3.40625 -4.37696,-8.79687 -0.61132,-2.47071 -0.35157,-0.79297 -2.89648,-4.31836 -6.60938,-6.87304 -11.20507,-8.17969 -5.84961,-2.86719 -7.53516,3.51367 -6.80859,4.76954 -0.44336,6.50195 1.48047,13.79297 2.64453,9.16406 2.28906,4.66992 0.51172,0.69922 1.83398,1.76563 5.42774,8.18945 0.42773,6.07422 -15.81054,15.81445 -6.07032,-0.42773 -8.18945,-5.42969 -1.76367,-1.83399 -0.69922,-0.51171 -4.66992,-2.28907 -9.15821,-2.64843 -13.79297,-1.47852 -6.5,0.44141 -4.76757,6.8125 -3.51367,7.53515 2.86914,5.85157 8.17382,11.20703 6.87305,6.61132 4.31641,2.90039 0.79297,0.34961 2.4707,0.61133 8.79492,4.37696 3.4043,5.04687 -5.78516,21.60156 -5.47265,2.66602 -9.80469,-0.60547 -2.44727,-0.70703 -0.85937,-0.0918 -5.1875,0.35156 -9.257816,2.28907 -12.68164,5.61523 -5.408203,3.63281 -0.72461,8.28516 0.72461,8.28516 5.408203,3.63281 12.68164,5.61523 9.257816,2.28907 5.1875,0.35156 0.85937,-0.0918 2.44727,-0.70703 9.80469,-0.60547 5.47265,2.66602 5.78516,21.60156 -3.4043,5.04687 -8.79492,4.37696 -2.4707,0.61133 -0.79297,0.34961 -4.31641,2.90039 -6.87305,6.61132 -8.17382,11.20703 -2.86914,5.85157 3.51367,7.53515 4.76757,6.8125 6.5,0.44141 13.79297,-1.47852 9.15821,-2.64843 4.66992,-2.28907 0.69922,-0.50976 1.76367,-1.83594 8.18945,-5.42969 6.07032,-0.42773 15.81054,15.81445 -0.42773,6.07422 -5.42774,8.18945 -1.83398,1.76563 -0.51172,0.69922 -2.28906,4.66992 -2.64453,9.16406 -1.48047,13.79297 0.44336,6.50195 6.80859,4.76758 7.53516,3.51758 5.84961,-2.86914 11.20507,-8.17969 6.60938,-6.87304 2.89648,-4.31836 0.35157,-0.79297 0.61132,-2.47071 4.37696,-8.79687 5.04492,-3.40625 21.5957,5.78711 2.66602,5.47461 -0.60547,9.80664 -0.70703,2.44726 -0.0937,0.85938 0.35156,5.18945 2.28906,9.25977 5.61328,12.68555 3.63477,5.41015 8.28125,0.72461 8.28125,-0.72461 3.63477,-5.41015 5.61328,-12.68555 2.28906,-9.25977 0.35156,-5.18945 -0.0937,-0.85938 -0.70703,-2.44726 -0.60547,-9.80664 2.66602,-5.47461 21.5957,-5.78711 5.04492,3.40625 4.37696,8.79687 0.61132,2.47071 0.35157,0.79297 2.89648,4.31836 6.60938,6.87304 11.20507,8.17969 5.84961,2.86914 7.53516,-3.51758 6.80859,-4.76758 0.44336,-6.50195 -1.48047,-13.79297 -2.64453,-9.16406 -2.28906,-4.66992 -0.51172,-0.69922 -1.83398,-1.76563 -5.42774,-8.18945 -0.42773,-6.07422 15.81054,-15.81445 6.07032,0.42773 8.18945,5.42969 1.76367,1.83594 0.69922,0.50976 4.66992,2.28907 9.15821,2.64843 13.79297,1.47852 6.5,-0.44141 v -0.002 l 4.76757,-6.81055 3.51367,-7.53711 -2.86914,-5.85156 -8.17382,-11.20508 -6.87305,-6.61328 -4.31641,-2.89843 -0.79297,-0.34961 -2.4707,-0.61133 -8.79492,-4.37891 -3.4043,-5.04492 5.78516,-21.60352 5.47265,-2.66797 9.80469,0.60938 2.44727,0.70703 0.85937,0.0918 5.1875,-0.35156 9.25782,-2.28907 12.68164,-5.61718 5.4082,-3.63282 0.72461,-8.28515 -0.72461,-8.28321 -5.4082,-3.63476 -12.68164,-5.61524 -9.25782,-2.28711 -5.1875,-0.35351 -0.85937,0.0937 -2.44727,0.70508 -9.80469,0.60937 -5.47265,-2.66797 -5.78516,-21.59961 3.4043,-5.04882 8.79492,-4.37696 2.4707,-0.61133 0.79297,-0.35156 4.31641,-2.89844 6.87305,-6.61132 8.17382,-11.20703 2.86914,-5.85157 -3.51367,-7.53711 -4.76757,-6.81054 -6.5,-0.44336 -13.79297,1.48047 -9.15821,2.64648 -4.66992,2.28906 -0.69922,0.51172 -1.76367,1.83594 -8.18945,5.42773 -6.07032,0.42774 -15.81054,-15.81446 0.42773,-6.07226 5.42774,-8.18945 1.83398,-1.76563 0.51172,-0.69922 2.28906,-4.67187 2.64453,-9.16016 1.48047,-13.79492 -0.44336,-6.50195 -6.80859,-4.76954 -7.53516,-3.51562 -5.84961,2.87109 -11.20507,8.17578 -6.60938,6.875 -2.89648,4.31836 -0.35157,0.79102 -0.61132,2.47266 -4.37696,8.79687 -5.04492,3.4082 -21.5957,-5.79101 -2.66602,-5.47266 0.60547,-9.80664 0.70703,-2.44726 0.0937,-0.85938 -0.35156,-5.19141 -2.28906,-9.259761 -5.61328,-12.683594 -3.63477,-5.412109 z m 0,97.111331 A 77.946197,77.946197 0 0 1 333.94531,256 77.946197,77.946197 0 0 1 256,333.94531 77.946197,77.946197 0 0 1 178.05469,256 77.946197,77.946197 0 0 1 256,178.05469 Z"
+           transform="matrix(0.38495268,0,0,0.40318156,-98.176247,1022.1341)"
+           id="path4768"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g4774"
+         inkscape:label="0"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.74041259;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
--- a/android/icons/rare_controls.svg
+++ b/android/icons/rare_controls.svg
@ -2,23 +2,23 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
-   width="512"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
   height="512"
-   viewBox="0 0 135.46666 135.46667"
+   viewBox="0 0 67.73333 135.46667"
   version="1.1"
   id="svg8"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   sodipodi:docname="overflow_btn.svg"
-   inkscape:export-filename="../../textures/base/pack/overflow_btn.png"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="rare_controls.svg"
+   inkscape:export-filename="/home/stu/Desktop/icons/png/rare_controls.png"
   inkscape:export-xdpi="24.000002"
-   inkscape:export-ydpi="24.000002"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
+   inkscape:export-ydpi="24.000002">
  <defs
     id="defs2">
    <filter
@ -397,24 +397,22 @@
     borderopacity="1.0"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="41.921331"
-     inkscape:cy="163.13964"
+     inkscape:zoom="0.7"
+     inkscape:cx="-59.862018"
+     inkscape:cy="260.34663"
     inkscape:document-units="mm"
     inkscape:current-layer="layer2"
     showgrid="true"
     units="px"
     inkscape:window-width="1920"
-     inkscape:window-height="1011"
+     inkscape:window-height="1023"
     inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="34"
     inkscape:window-maximized="1"
     inkscape:pagecheckerboard="false"
     inkscape:snap-grids="true"
     inkscape:snap-page="true"
-     showguides="false"
-     inkscape:showpageshadow="2"
-     inkscape:deskcolor="#d1d1d1">
+     showguides="false">
    <inkscape:grid
       type="xygrid"
       id="grid16"
@ -424,11 +422,7 @@
       color="#40ff40"
       opacity="0.1254902"
       empcolor="#40ff40"
-       empopacity="0.25098039"
-       originx="0"
-       originy="0"
-       units="px"
-       visible="true" />
+       empopacity="0.25098039" />
  </sodipodi:namedview>
  <metadata
     id="metadata5">
@ -438,6 +432,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
        <cc:license
           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
      </cc:Work>
@ -501,27 +496,26 @@
           x="264.65997"
           y="124.10143"
           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" /></flowRegion><flowPara
-         id="flowPara4724" /></flowRoot>
+         id="flowPara4724" /></flowRoot>    <rect
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5231-9"
+       width="25.4"
+       height="25.400003"
+       x="21.166666"
+       y="101.6" />
    <rect
-       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.38756;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5231-9-7"
+       width="25.4"
+       height="25.400003"
+       x="21.166666"
+       y="55.033333" />
+    <rect
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect5231-9-5"
-       width="96.212502"
-       height="0.61243516"
-       x="19.62678"
-       y="33.575779" />
-    <rect
-       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.38755;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5231-9-5-7"
-       width="96.212448"
-       height="0.6124543"
-       x="19.627108"
-       y="67.442772" />
-    <rect
-       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.38755;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5231-9-5-7-5"
-       width="96.212448"
-       height="0.6124543"
-       x="19.627108"
-       y="101.30978" />
+       width="25.4"
+       height="25.400003"
+       x="21.166664"
+       y="8.4666681" />
  </g>
 </svg>
--- a/android/native/build.gradle
+++ b/android/native/build.gradle
@ -52,7 +52,7 @@ if (new File(depsDir, 'armeabi-v7a').exists()) {
 	task downloadDeps(type: Download) {
 		def depsZip = new File(buildDir, 'deps.zip')

-		src 'https://github.com/luanti-org/luanti_android_deps/releases/download/latest/deps-lite.zip'
+		src 'https://github.com/minetest/minetest_android_deps/releases/download/latest/deps-lite.zip'
 		dest depsZip
 		overwrite false

--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -1,2 +1,2 @@
-rootProject.name = "Luanti"
+rootProject.name = "Minetest"
 include ':app', ':native'
--- a/builtin/client/chatcommands.lua
+++ b/builtin/client/chatcommands.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/client/chatcommands.lua
+
 core.register_on_sending_chat_message(function(message)
 	if message:sub(1,2) == ".." then
 		return false
--- a/builtin/client/death_formspec.lua
+++ b/builtin/client/death_formspec.lua
@ -0,0 +1,15 @@
+-- CSM death formspec. Only used when clientside modding is enabled, otherwise
+-- handled by the engine.
+
+core.register_on_death(function()
+	local formspec = "size[11,5.5]bgcolor[#320000b4;true]" ..
+		"label[4.85,1.35;" .. fgettext("You died") ..
+		"]button_exit[4,3;3,0.5;btn_respawn;".. fgettext("Respawn") .."]"
+	core.show_formspec("bultin:death", formspec)
+end)
+
+core.register_on_formspec_input(function(formname, fields)
+	if formname == "bultin:death" then
+		core.send_respawn()
+	end
+end)
--- a/builtin/client/init.lua
+++ b/builtin/client/init.lua
@ -1,15 +1,14 @@
+-- Minetest: builtin/client/init.lua
 local scriptpath = core.get_builtin_path()
 local clientpath = scriptpath.."client"..DIR_DELIM
 local commonpath = scriptpath.."common"..DIR_DELIM

-local builtin_shared = {}
-
-assert(loadfile(commonpath .. "register.lua"))(builtin_shared)
-assert(loadfile(clientpath .. "register.lua"))(builtin_shared)
+dofile(clientpath .. "register.lua")
 dofile(commonpath .. "after.lua")
 dofile(commonpath .. "mod_storage.lua")
 dofile(commonpath .. "chatcommands.lua")
 dofile(commonpath .. "information_formspecs.lua")
 dofile(clientpath .. "chatcommands.lua")
+dofile(clientpath .. "death_formspec.lua")
 dofile(clientpath .. "misc.lua")
 assert(loadfile(commonpath .. "item_s.lua"))({}) -- Just for push/read node functions
--- a/builtin/client/register.lua
+++ b/builtin/client/register.lua
@ -1,6 +1,68 @@
-local builtin_shared = ...
+core.callback_origins = {}

-local make_registration = builtin_shared.make_registration
+local getinfo = debug.getinfo
+debug.getinfo = nil
+
+--- Runs given callbacks.
+--
+-- Note: this function is also called from C++
+-- @tparam table  callbacks a table with registered callbacks, like `core.registered_on_*`
+-- @tparam number mode      a RunCallbacksMode, as defined in src/script/common/c_internal.h
+-- @param         ...       arguments for the callback
+-- @return depends on mode
+function core.run_callbacks(callbacks, mode, ...)
+	assert(type(callbacks) == "table")
+	local cb_len = #callbacks
+	if cb_len == 0 then
+		if mode == 2 or mode == 3 then
+			return true
+		elseif mode == 4 or mode == 5 then
+			return false
+		end
+	end
+	local ret
+	for i = 1, cb_len do
+		local cb_ret = callbacks[i](...)
+
+		if mode == 0 and i == 1 or mode == 1 and i == cb_len then
+			ret = cb_ret
+		elseif mode == 2 then
+			if not cb_ret or i == 1 then
+				ret = cb_ret
+			end
+		elseif mode == 3 then
+			if cb_ret then
+				return cb_ret
+			end
+			ret = cb_ret
+		elseif mode == 4 then
+			if (cb_ret and not ret) or i == 1 then
+				ret = cb_ret
+			end
+		elseif mode == 5 and cb_ret then
+			return cb_ret
+		end
+	end
+	return ret
+end
+
+--
+-- Callback registration
+--
+
+local function make_registration()
+	local t = {}
+	local registerfunc = function(func)
+		t[#t + 1] = func
+		core.callback_origins[func] = {
+			mod = core.get_current_modname() or "??",
+			name = getinfo(1, "n").name or "??"
+		}
+		--local origin = core.callback_origins[func]
+		--print(origin.name .. ": " .. origin.mod .. " registering cbk " .. tostring(func))
+	end
+	return t, registerfunc
+end

 core.registered_globalsteps, core.register_globalstep = make_registration()
 core.registered_on_mods_loaded, core.register_on_mods_loaded = make_registration()
--- a/builtin/common/after.lua
+++ b/builtin/common/after.lua
@ -155,7 +155,7 @@ end

 function core.after(after, func, ...)
 	assert(tonumber(after) and not core.is_nan(after) and type(func) == "function",
-		"Invalid core.after invocation")
+		"Invalid minetest.after invocation")

 	local new_job = {
 		mod_origin = core.get_last_run_mod(),
--- a/builtin/common/chatcommands.lua
+++ b/builtin/common/chatcommands.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/common/chatcommands.lua
+
 -- For server-side translations (if INIT == "game")
 -- Otherwise, use core.gettext
 local S = core.get_translator("__builtin")
--- a/builtin/common/filterlist.lua
+++ b/builtin/common/filterlist.lua
@ -1,4 +1,4 @@
--Luanti
+--Minetest
 --Copyright (C) 2013 sapier
 --
 --This program is free software; you can redistribute it and/or modify
--- a/builtin/common/information_formspecs.lua
+++ b/builtin/common/information_formspecs.lua
@ -69,7 +69,7 @@ local function build_chatcommands_formspec(name, sel, copy)
 				description = cmds[2].description
 				if copy then
 					local msg = S("Command: @1 @2",
-						core.colorize("#0FF", (INIT == "client" and "." or "/") .. cmds[1]), cmds[2].params)
+						core.colorize("#0FF", "/" .. cmds[1]), cmds[2].params)
 					if INIT == "client" then
 						core.display_chat_message(msg)
 					else
--- a/builtin/common/item_s.lua
+++ b/builtin/common/item_s.lua
@ -1,3 +1,4 @@
+-- Minetest: builtin/item_s.lua
 -- The distinction of what goes here is a bit tricky, basically it's everything
 -- that does not (directly or indirectly) need access to ServerEnvironment,
 -- Server or writable access to IGameDef on the engine side.
@ -90,7 +91,7 @@ local facedir_to_dir_map = {
 	1, 4, 3, 2,
 }
 function core.facedir_to_dir(facedir)
-	return vector.copy(facedir_to_dir[facedir_to_dir_map[facedir % 32]])
+	return facedir_to_dir[facedir_to_dir_map[facedir % 32]]
 end

 function core.dir_to_fourdir(dir)
@ -110,7 +111,7 @@ function core.dir_to_fourdir(dir)
 end

 function core.fourdir_to_dir(fourdir)
-	return vector.copy(facedir_to_dir[facedir_to_dir_map[fourdir % 4]])
+	return facedir_to_dir[facedir_to_dir_map[fourdir % 4]]
 end

 function core.dir_to_wallmounted(dir)
@ -147,7 +148,7 @@ local wallmounted_to_dir = {
 	vector.new( 0, -1,  0),
 }
 function core.wallmounted_to_dir(wallmounted)
-	return vector.copy(wallmounted_to_dir[wallmounted % 8])
+	return wallmounted_to_dir[wallmounted % 8]
 end

 function core.dir_to_yaw(dir)
@ -165,19 +166,20 @@ function core.is_colored_paramtype(ptype)
 end

 function core.strip_param2_color(param2, paramtype2)
-	if paramtype2 == "color" then
-		return param2
-	elseif paramtype2 == "colorfacedir" then
-		return math.floor(param2 / 32) * 32
-	elseif paramtype2 == "color4dir" then
-		return math.floor(param2 / 4) * 4
-	elseif paramtype2 == "colorwallmounted" then
-		return math.floor(param2 / 8) * 8
-	elseif paramtype2 == "colordegrotate" then
-		return math.floor(param2 / 32) * 32
-	else
+	if not core.is_colored_paramtype(paramtype2) then
 		return nil
 	end
+	if paramtype2 == "colorfacedir" then
+		param2 = math.floor(param2 / 32) * 32
+	elseif paramtype2 == "color4dir" then
+		param2 = math.floor(param2 / 4) * 4
+	elseif paramtype2 == "colorwallmounted" then
+		param2 = math.floor(param2 / 8) * 8
+	elseif paramtype2 == "colordegrotate" then
+		param2 = math.floor(param2 / 32) * 32
+	end
+	-- paramtype2 == "color" requires no modification.
+	return param2
 end

 -- Content ID caching
--- a/builtin/common/math.lua
+++ b/builtin/common/math.lua
@ -1,41 +0,0 @@
--[[
-    Math utils.
--]]
-
-function math.hypot(x, y)
-	return math.sqrt(x * x + y * y)
-end
-
-function math.sign(x, tolerance)
-	tolerance = tolerance or 0
-	if x > tolerance then
-		return 1
-	elseif x < -tolerance then
-		return -1
-	end
-	return 0
-end
-
-function math.factorial(x)
-	assert(x % 1 == 0 and x >= 0, "factorial expects a non-negative integer")
-	if x >= 171 then
-		-- 171! is greater than the biggest double, no need to calculate
-		return math.huge
-	end
-	local v = 1
-	for k = 2, x do
-		v = v * k
-	end
-	return v
-end
-
-function math.round(x)
-	if x < 0 then
-		local int = math.ceil(x)
-		local frac = x - int
-		return int - ((frac <= -0.5) and 1 or 0)
-	end
-	local int = math.floor(x)
-	local frac = x - int
-	return int + ((frac >= 0.5) and 1 or 0)
-end
--- a/builtin/common/metatable.lua
+++ b/builtin/common/metatable.lua
@ -11,8 +11,8 @@ end
 core.known_metatables = known_metatables

 function core.register_async_metatable(...)
-	core.log("deprecated", "core.register_async_metatable is deprecated. " ..
-			"Use core.register_portable_metatable instead.")
+	core.log("deprecated", "minetest.register_async_metatable is deprecated. " ..
+			"Use minetest.register_portable_metatable instead.")
 	return core.register_portable_metatable(...)
 end

--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@ -1,7 +1,8 @@
+-- Minetest: builtin/misc_helpers.lua
+
 --------------------------------------------------------------------------------
 -- Localize functions to avoid table lookups (better performance).
 local string_sub, string_find = string.sub, string.find
-local math = math

 --------------------------------------------------------------------------------
 local function basic_dump(o)
@ -205,18 +206,49 @@ function table.indexof(list, val)
 end

 --------------------------------------------------------------------------------
-function table.keyof(tb, val)
-	for k, v in pairs(tb) do
-		if v == val then
-			return k
-		end
-	end
-	return nil
+function string:trim()
+	return self:match("^%s*(.-)%s*$")
 end

 --------------------------------------------------------------------------------
-function string:trim()
-	return self:match("^%s*(.-)%s*$")
+function math.hypot(x, y)
+	return math.sqrt(x * x + y * y)
+end
+
+--------------------------------------------------------------------------------
+function math.sign(x, tolerance)
+	tolerance = tolerance or 0
+	if x > tolerance then
+		return 1
+	elseif x < -tolerance then
+		return -1
+	end
+	return 0
+end
+
+--------------------------------------------------------------------------------
+function math.factorial(x)
+	assert(x % 1 == 0 and x >= 0, "factorial expects a non-negative integer")
+	if x >= 171 then
+		-- 171! is greater than the biggest double, no need to calculate
+		return math.huge
+	end
+	local v = 1
+	for k = 2, x do
+		v = v * k
+	end
+	return v
+end
+
+function math.round(x)
+	if x < 0 then
+		local int = math.ceil(x)
+		local frac = x - int
+		return int - ((frac <= -0.5) and 1 or 0)
+	end
+	local int = math.floor(x)
+	local frac = x - int
+	return int + ((frac >= 0.5) and 1 or 0)
 end

 local formspec_escapes = {
@ -233,16 +265,6 @@ function core.formspec_escape(text)
 end


-local hypertext_escapes = {
-	["\\"] = "\\\\",
-	["<"] = "\\<",
-	[">"] = "\\>",
-}
-function core.hypertext_escape(text)
-	return text and text:gsub("[\\<>]", hypertext_escapes)
-end
-
-
 function core.wrap_text(text, max_length, as_table)
 	local result = {}
 	local line = {}
@ -572,14 +594,12 @@ function core.strip_colors(str)
 	return (str:gsub(ESCAPE_CHAR .. "%([bc]@[^)]+%)", ""))
 end

-local function translate(textdomain, str, num, ...)
+function core.translate(textdomain, str, ...)
 	local start_seq
-	if textdomain == "" and num == "" then
+	if textdomain == "" then
 		start_seq = ESCAPE_CHAR .. "T"
-	elseif num == "" then
-		start_seq = ESCAPE_CHAR .. "(T@" .. textdomain .. ")"
 	else
-		start_seq = ESCAPE_CHAR .. "(T@" .. textdomain .. "@" .. num .. ")"
+		start_seq = ESCAPE_CHAR .. "(T@" .. textdomain .. ")"
 	end
 	local arg = {n=select('#', ...), ...}
 	local end_seq = ESCAPE_CHAR .. "E"
@ -610,31 +630,8 @@ local function translate(textdomain, str, num, ...)
 	return start_seq .. translated .. end_seq
 end

-function core.translate(textdomain, str, ...)
-	return translate(textdomain, str, "", ...)
-end
-
-function core.translate_n(textdomain, str, str_plural, n, ...)
-	assert (type(n) == "number")
-	assert (n >= 0)
-	assert (math.floor(n) == n)
-
-	-- Truncate n if too large
-	local max = 1000000
-	if n >= 2 * max then
-		n = n % max + max
-	end
-	if n == 1 then
-		return translate(textdomain, str, "1", ...)
-	else
-		return translate(textdomain, str_plural, tostring(n), ...)
-	end
-end
-
 function core.get_translator(textdomain)
-	return
-		(function(str, ...) return core.translate(textdomain or "", str, ...) end),
-		(function(str, str_plural, n, ...) return core.translate_n(textdomain or "", str, str_plural, n, ...) end)
+	return function(str, ...) return core.translate(textdomain or "", str, ...) end
 end

 --------------------------------------------------------------------------------
@ -695,7 +692,6 @@ function core.privs_to_string(privs, delim)
 			list[#list + 1] = priv
 		end
 	end
-	table.sort(list)
 	return table.concat(list, delim)
 end

--- a/builtin/common/register.lua
+++ b/builtin/common/register.lua
@ -54,8 +54,7 @@ function builtin_shared.make_registration()
 	local registerfunc = function(func)
 		t[#t + 1] = func
 		core.callback_origins[func] = {
-			-- may be nil or return nil
-			mod = core.get_current_modname and core.get_current_modname() or "??",
+			mod = core.get_current_modname() or "??",
 			name = debug.getinfo(1, "n").name or "??"
 		}
 	end
@ -67,8 +66,7 @@ function builtin_shared.make_registration_reverse()
 	local registerfunc = function(func)
 		table.insert(t, 1, func)
 		core.callback_origins[func] = {
-			-- may be nil or return nil
-			mod = core.get_current_modname and core.get_current_modname() or "??",
+			mod = core.get_current_modname() or "??",
 			name = debug.getinfo(1, "n").name or "??"
 		}
 	end
--- a/builtin/common/serialize.lua
+++ b/builtin/common/serialize.lua
@ -204,18 +204,18 @@ local function dummy_func() end
 function core.deserialize(str, safe)
 	-- Backwards compatibility
 	if str == nil then
-		core.log("deprecated", "core.deserialize called with nil (expected string).")
+		core.log("deprecated", "minetest.deserialize called with nil (expected string).")
 		return nil, "Invalid type: Expected a string, got nil"
 	end
 	local t = type(str)
 	if t ~= "string" then
-		error(("core.deserialize called with %s (expected string)."):format(t))
+		error(("minetest.deserialize called with %s (expected string)."):format(t))
 	end

 	local func, err = loadstring(str)
 	if not func then return nil, err end

-	-- math.huge was serialized to inf and NaNs to nan by Lua in engine version 5.6, so we have to support this here
+	-- math.huge was serialized to inf and NaNs to nan by Lua in Minetest 5.6, so we have to support this here
 	local env = {inf = math_huge, nan = 0/0}
 	if safe then
 		env.loadstring = dummy_func
--- a/builtin/common/tests/after_spec.lua
+++ b/builtin/common/tests/after_spec.lua
@ -1,7 +1,6 @@
 _G.core = {}
 _G.vector = {metatable = {}}

-dofile("builtin/common/math.lua")
 dofile("builtin/common/vector.lua")
 dofile("builtin/common/misc_helpers.lua")

--- a/builtin/common/tests/math_spec.lua
+++ b/builtin/common/tests/math_spec.lua
@ -1,16 +0,0 @@
-_G.core = {}
-dofile("builtin/common/math.lua")
-
-describe("math", function()
-	it("round()", function()
-		assert.equal(0, math.round(0))
-		assert.equal(10, math.round(10.3))
-		assert.equal(11, math.round(10.5))
-		assert.equal(11, math.round(10.7))
-		assert.equal(-10, math.round(-10.3))
-		assert.equal(-11, math.round(-10.5))
-		assert.equal(-11, math.round(-10.7))
-		assert.equal(0, math.round(0.49999999999999994))
-		assert.equal(0, math.round(-0.49999999999999994))
-	end)
-end)
--- a/builtin/common/tests/misc_helpers_spec.lua
+++ b/builtin/common/tests/misc_helpers_spec.lua
@ -1,5 +1,4 @@
 _G.core = {}
-dofile("builtin/common/math.lua")
 dofile("builtin/common/vector.lua")
 dofile("builtin/common/misc_helpers.lua")

@ -167,16 +166,6 @@ describe("table", function()
 	it("indexof()", function()
 		assert.equal(1, table.indexof({"foo", "bar"}, "foo"))
 		assert.equal(-1, table.indexof({"foo", "bar"}, "baz"))
-		assert.equal(-1, table.indexof({[2] = "foo", [3] = "bar"}, "foo"))
-		assert.equal(-1, table.indexof({[1] = "foo", [3] = "bar"}, "bar"))
-	end)
-
-	it("keyof()", function()
-		assert.equal("a", table.keyof({a = "foo", b = "bar"}, "foo"))
-		assert.equal(nil, table.keyof({a = "foo", b = "bar"}, "baz"))
-		assert.equal(1, table.keyof({"foo", "bar"}, "foo"))
-		assert.equal(2, table.keyof({[2] = "foo", [3] = "bar"}, "foo"))
-		assert.equal(3, table.keyof({[1] = "foo", [3] = "bar"}, "bar"))
 	end)
 end)

--- a/builtin/common/tests/vector_spec.lua
+++ b/builtin/common/tests/vector_spec.lua
@ -1,5 +1,4 @@
 _G.vector = {}
-dofile("builtin/common/math.lua")
 dofile("builtin/common/vector.lua")

 describe("vector", function()
@ -114,35 +113,12 @@ describe("vector", function()
 		assert.equal(vector.new(0, 1, -1), a:round())
 	end)

-	it("ceil()", function()
-		local a = vector.new(0.1, 0.9, -0.5)
-		assert.equal(vector.new(1, 1, 0), vector.ceil(a))
-		assert.equal(vector.new(1, 1, 0), a:ceil())
-	end)
-
-	it("sign()", function()
-		local a = vector.new(-120.3, 0, 231.5)
-		assert.equal(vector.new(-1, 0, 1), vector.sign(a))
-		assert.equal(vector.new(-1, 0, 1), a:sign())
-		assert.equal(vector.new(0, 0, 1), vector.sign(a, 200))
-		assert.equal(vector.new(0, 0, 1), a:sign(200))
-	end)
-
-	it("abs()", function()
-		local a = vector.new(-123.456, 0, 13)
-		assert.equal(vector.new(123.456, 0, 13), vector.abs(a))
-		assert.equal(vector.new(123.456, 0, 13), a:abs())
-	end)
-
 	it("apply()", function()
 		local i = 0
 		local f = function(x)
 			i = i + 1
 			return x + i
 		end
-		local f2 = function(x, opt1, opt2, opt3)
-			return x + opt1 + opt2 + opt3
-		end
 		local a = vector.new(0.1, 0.9, -0.5)
 		assert.equal(vector.new(1, 1, 0), vector.apply(a, math.ceil))
 		assert.equal(vector.new(1, 1, 0), a:apply(math.ceil))
@ -150,9 +126,6 @@ describe("vector", function()
 		assert.equal(vector.new(0.1, 0.9, 0.5), a:apply(math.abs))
 		assert.equal(vector.new(1.1, 2.9, 2.5), vector.apply(a, f))
 		assert.equal(vector.new(4.1, 5.9, 5.5), a:apply(f))
-		local b = vector.new(1, 2, 3)
-		assert.equal(vector.new(4, 5, 6), vector.apply(b, f2, 1, 1, 1))
-		assert.equal(vector.new(4, 5, 6), b:apply(f2, 1, 1, 1))
 	end)

 	it("combine()", function()
@ -496,13 +469,4 @@ describe("vector", function()
 		assert.True(vector.in_area(vector.new(-10, -10, -10), vector.new(-10, -10, -10), vector.new(10, 10, 10)))
 		assert.False(vector.in_area(vector.new(-10, -10, -10), vector.new(10, 10, 10), vector.new(-11, -10, -10)))
 	end)
-
-	it("random_in_area()", function()
-		local min = vector.new(-100, -100, -100)
-		local max = vector.new(100, 100, 100)
-		for i = 1, 1000 do
-			local random = vector.random_in_area(min, max)
-			assert.True(vector.in_area(random, min, max))
-		end
-	end)
 end)
--- a/builtin/common/vector.lua
+++ b/builtin/common/vector.lua
@ -5,7 +5,6 @@ Note: The vector.*-functions must be able to accept old vectors that had no meta

 -- localize functions
 local setmetatable = setmetatable
-local math = math

 vector = {}

@ -98,26 +97,18 @@ function vector.floor(v)
 end

 function vector.round(v)
-	return vector.apply(v, math.round)
-end
-
-function vector.ceil(v)
-	return vector.apply(v, math.ceil)
-end
-
-function vector.sign(v, tolerance)
-	return vector.apply(v, math.sign, tolerance)
-end
-
-function vector.abs(v)
-	return vector.apply(v, math.abs)
-end
-
-function vector.apply(v, func, ...)
 	return fast_new(
-		func(v.x, ...),
-		func(v.y, ...),
-		func(v.z, ...)
+		math.round(v.x),
+		math.round(v.y),
+		math.round(v.z)
+	)
+end
+
+function vector.apply(v, func)
+	return fast_new(
+		func(v.x),
+		func(v.y),
+		func(v.z)
 	)
 end

@ -384,26 +375,6 @@ function vector.in_area(pos, min, max)
 		(pos.z >= min.z) and (pos.z <= max.z)
 end

-function vector.random_direction()
-	-- Generate a random direction of unit length, via rejection sampling
-	local x, y, z, l2
-	repeat -- expected less than two attempts on average (volume sphere vs. cube)
-		x, y, z = math.random() * 2 - 1, math.random() * 2 - 1, math.random() * 2 - 1
-		l2 = x*x + y*y + z*z
-	until l2 <= 1 and l2 >= 1e-6
-	-- normalize
-	local l = math.sqrt(l2)
-	return fast_new(x/l, y/l, z/l)
-end
-
-function vector.random_in_area(min, max)
-	return fast_new(
-		math.random(min.x, max.x),
-		math.random(min.y, max.y),
-		math.random(min.z, max.z)
-	)
-end
-
 if rawget(_G, "core") and core.set_read_vector and core.set_push_vector then
 	local function read_vector(v)
 		return v.x, v.y, v.z
--- a/builtin/emerge/env.lua
+++ b/builtin/emerge/env.lua
@ -23,8 +23,6 @@ core.add_node = core.set_node
 -- we don't deal with metadata currently
 core.swap_node = core.set_node

-core.bulk_swap_node = core.bulk_set_node
-
 function core.remove_node(pos)
 	return core.vmanip:set_node_at(pos, {name="air"})
 end
--- a/builtin/fstk/buttonbar.lua
+++ b/builtin/fstk/buttonbar.lua
@ -1,4 +1,4 @@
--Luanti
+--Minetest
 --Copyright (C) 2014 sapier
 --Copyright (C) 2023 Gregor Parzefall
 --
@ -19,7 +19,7 @@

 local BASE_SPACING = 0.1
 local function get_scroll_btn_width()
-	return core.settings:get_bool("touch_gui") and 0.8 or 0.5
+	return core.settings:get_bool("enable_touch") and 0.8 or 0.5
 end

 local function buttonbar_formspec(self)
@ -28,8 +28,10 @@ local function buttonbar_formspec(self)
 	end

 	local formspec = {
+		"style_type[box;noclip=true]",
 		string.format("box[%f,%f;%f,%f;%s]", self.pos.x, self.pos.y, self.size.x,
 				self.size.y, self.bgcolor),
+		"style_type[box;noclip=false]",
 	}

 	local btn_size = self.size.y - 2*BASE_SPACING
@ -38,7 +40,7 @@ local function buttonbar_formspec(self)
 	-- `BASE_SPACING` is used as the minimum spacing, like `gap` in CSS Flexbox.

 	-- The number of buttons per page is always calculated as if the scroll
-	-- buttons were visible.
+    -- buttons were visible.
 	local avail_space = self.size.x - 2*BASE_SPACING - 2*get_scroll_btn_width()
 	local btns_per_page = math.floor((avail_space - BASE_SPACING) / (btn_size + BASE_SPACING))

@ -69,7 +71,7 @@ local function buttonbar_formspec(self)
 			y = self.pos.y + BASE_SPACING,
 		}

-		table.insert(formspec, string.format("image_button[%f,%f;%f,%f;%s;%s;%s;false;false]tooltip[%s;%s]",
+		table.insert(formspec, string.format("image_button[%f,%f;%f,%f;%s;%s;%s;true;false]tooltip[%s;%s]",
 				btn_pos.x, btn_pos.y, btn_size, btn_size, btn.image, btn.name,
 				btn.caption, btn.name, btn.tooltip))
 	end
@ -84,6 +86,9 @@ local function buttonbar_formspec(self)
 			y = self.pos.y + BASE_SPACING,
 		}

+		table.insert(formspec, string.format("style[%s,%s;noclip=true]",
+				self.btn_prev_name, self.btn_next_name))
+
 		table.insert(formspec, string.format("button[%f,%f;%f,%f;%s;<]",
 				btn_prev_pos.x, btn_prev_pos.y, get_scroll_btn_width(), btn_size,
 				self.btn_prev_name))
--- a/builtin/fstk/dialog.lua
+++ b/builtin/fstk/dialog.lua
@ -1,4 +1,4 @@
--Luanti
+--Minetest
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
--- a/builtin/fstk/tabview.lua
+++ b/builtin/fstk/tabview.lua
@ -1,4 +1,4 @@
--Luanti
+--Minetest
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
@ -66,22 +66,11 @@ local function get_formspec(self)

 	local content, prepend = tab.get_formspec(self, tab.name, tab.tabdata, tab.tabsize)

-	local TOUCH_GUI = core.settings:get_bool("touch_gui")
-
-	local orig_tsize = tab.tabsize or { width = self.width, height = self.height }
-	local tsize = { width = orig_tsize.width, height = orig_tsize.height }
-	tsize.height = tsize.height
-		+ TABHEADER_H -- tabheader included in formspec size
-		+ (TOUCH_GUI and GAMEBAR_OFFSET_TOUCH or GAMEBAR_OFFSET_DESKTOP)
-		+ GAMEBAR_H -- gamebar included in formspec size
-
+	local tsize = tab.tabsize or { width = self.width, height = self.height }
 	if self.parent == nil and not prepend then
 		prepend = string.format("size[%f,%f,%s]", tsize.width, tsize.height,
 				dump(self.fixed_size))

-		local anchor_pos = TABHEADER_H + orig_tsize.height / 2
-		prepend = prepend .. ("anchor[0.5,%f]"):format(anchor_pos / tsize.height)
-
 		if tab.formspec_version then
 			prepend = ("formspec_version[%d]"):format(tab.formspec_version) .. prepend
 		end
@ -89,15 +78,12 @@ local function get_formspec(self)

 	local end_button_size = 0.75

-	local tab_header_size = { width = tsize.width, height = TABHEADER_H }
+	local tab_header_size = { width = tsize.width, height = 0.85 }
 	if self.end_button then
 		tab_header_size.width = tab_header_size.width - end_button_size - 0.1
 	end

-	local formspec = (prepend or "")
-	formspec = formspec .. ("bgcolor[;neither]container[0,%f]box[0,0;%f,%f;#0000008C]"):format(
-			TABHEADER_H, orig_tsize.width, orig_tsize.height)
-	formspec = formspec .. self:tab_header(tab_header_size) .. content
+	local formspec = (prepend or "") .. self:tab_header(tab_header_size) .. content

 	if self.end_button then
 		formspec = formspec ..
@ -112,8 +98,6 @@ local function get_formspec(self)
 						self.end_button.name)
 	end

-	formspec = formspec .. "container_end[]"
-
 	return formspec
 end

--- a/builtin/fstk/ui.lua
+++ b/builtin/fstk/ui.lua
@ -1,4 +1,4 @@
--Luanti
+--Minetest
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
--- a/builtin/game/async.lua
+++ b/builtin/game/async.lua
@ -10,7 +10,7 @@ end

 function core.handle_async(func, callback, ...)
 	assert(type(func) == "function" and type(callback) == "function",
-		"Invalid core.handle_async invocation")
+		"Invalid minetest.handle_async invocation")
 	local args = {n = select("#", ...), ...}
 	local mod_origin = core.get_last_run_mod()

--- a/builtin/game/auth.lua
+++ b/builtin/game/auth.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/auth.lua
+
 --
 -- Builtin authentication handler
 --
@ -93,11 +95,11 @@ core.builtin_auth_handler = {
 		for priv, value in pairs(privileges) do
 			-- Warnings for improper API usage
 			if value == false then
-				core.log('deprecated', "`false` value given to `core.set_player_privs`, "..
+				core.log('deprecated', "`false` value given to `minetest.set_player_privs`, "..
 						"this is almost certainly a bug, "..
 						"granting a privilege rather than revoking it")
 			elseif value ~= true then
-				core.log('deprecated', "non-`true` value given to `core.set_player_privs`")
+				core.log('deprecated', "non-`true` value given to `minetest.set_player_privs`")
 			end
 			-- Run grant callbacks
 			if prev_privs[priv] == nil then
@ -194,7 +196,7 @@ function core.change_player_privs(name, changes)
 		elseif change == false then
 			privs[priv] = nil
 		else
-			error("non-bool value given to `core.change_player_privs`")
+			error("non-bool value given to `minetest.change_player_privs`")
 		end
 	end
 	core.set_player_privs(name, privs)
--- a/builtin/game/chat.lua
+++ b/builtin/game/chat.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/game/chat.lua
+
 local S = core.get_translator("__builtin")

 -- Helper function that implements search and replace without pattern matching
@ -219,7 +221,6 @@ core.register_chatcommand("haspriv", {
 			return true, S("No online player has the \"@1\" privilege.",
 					param)
 		else
-			table.sort(players_with_priv)
 			return true, S("Players online with the \"@1\" privilege: @2",
 					param,
 					table.concat(players_with_priv, ", "))
--- a/builtin/game/constants.lua
+++ b/builtin/game/constants.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/constants.lua
+
 --
 -- Constants values for use with the Lua API
 --
--- a/builtin/game/death_screen.lua
+++ b/builtin/game/death_screen.lua
@ -1,31 +0,0 @@
-local F = core.formspec_escape
-local S = core.get_translator("__builtin")
-
-function core.show_death_screen(player, _reason)
-	local fs = {
-		"formspec_version[1]",
-		"size[11,5.5,true]",
-		"bgcolor[#320000b4;true]",
-		"label[4.85,1.35;", F(S("You died")), "]",
-		"button_exit[4,3;3,0.5;btn_respawn;", F(S("Respawn")), "]",
-	}
-	core.show_formspec(player:get_player_name(), "__builtin:death", table.concat(fs, ""))
-end
-
-core.register_on_dieplayer(function(player, reason)
-	core.show_death_screen(player, reason)
-end)
-
-core.register_on_joinplayer(function(player)
-	if player:get_hp() == 0 then
-		core.show_death_screen(player, nil)
-	end
-end)
-
-core.register_on_player_receive_fields(function(player, formname, fields)
-	if formname == "__builtin:death" and fields.quit and player:get_hp() == 0 then
-		player:respawn()
-		core.log("action", player:get_player_name() .. " respawns at " ..
-				player:get_pos():to_string())
-	end
-end)
--- a/builtin/game/deprecated.lua
+++ b/builtin/game/deprecated.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/deprecated.lua
+
 --
 -- EnvRef
 --
@ -33,9 +35,9 @@ local settings = core.settings

 local function setting_proxy(name)
 	return function(...)
-		core.log("deprecated", "WARNING: core.setting_* "..
+		core.log("deprecated", "WARNING: minetest.setting_* "..
 			"functions are deprecated.  "..
-			"Use methods on the core.settings object.")
+			"Use methods on the minetest.settings object.")
 		return settings[name](settings, ...)
 	end
 end
--- a/builtin/game/detached_inventory.lua
+++ b/builtin/game/detached_inventory.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/detached_inventory.lua
+
 core.detached_inventories = {}

 local create_detached_inventory_raw = core.create_detached_inventory_raw
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@ -1,4 +1,7 @@
+-- Minetest: builtin/item.lua
+
 local builtin_shared = ...
+local SCALE = 0.667

 local facedir_to_euler = {
 	{y = 0, x = 0, z = 0},
@ -35,7 +38,9 @@ local gravity = tonumber(core.settings:get("movement_gravity")) or 9.81

 core.register_entity(":__builtin:falling_node", {
 	initial_properties = {
-		visual = "node",
+		visual = "item",
+		visual_size = vector.new(SCALE, SCALE, SCALE),
+		textures = {},
 		physical = true,
 		is_visible = false,
 		collide_with_objects = true,
@ -75,17 +80,43 @@ core.register_entity(":__builtin:falling_node", {
 		self.floats = core.get_item_group(node.name, "float") ~= 0

 		-- Save liquidtype for falling water
-		self.liquidtype = def.liquidtype
+        self.liquidtype = def.liquidtype

-		-- Set up entity visuals
-		-- For compatibility with older clients we continue to use "item" visual
-		-- for simple situations.
-		local drawtypes = {normal=true, glasslike=true, allfaces=true, nodebox=true}
-		local p2types = {none=true, facedir=true, ["4dir"]=true}
-		if drawtypes[def.drawtype] and p2types[def.paramtype2] and def.use_texture_alpha ~= "blend" then
+		-- Set entity visuals
+		if def.drawtype == "torchlike" or def.drawtype == "signlike" then
+			local textures
+			if def.tiles and def.tiles[1] then
+				local tile = def.tiles[1]
+				if type(tile) == "table" then
+					tile = tile.name
+				end
+				if def.drawtype == "torchlike" then
+					textures = { "("..tile..")^[transformFX", tile }
+				else
+					textures = { tile, "("..tile..")^[transformFX" }
+				end
+			end
+			local vsize
+			if def.visual_scale then
+				local s = def.visual_scale
+				vsize = vector.new(s, s, s)
+			end
+			self.object:set_properties({
+				is_visible = true,
+				visual = "upright_sprite",
+				visual_size = vsize,
+				textures = textures,
+				glow = def.light_source,
+			})
+		elseif def.drawtype ~= "airlike" then
+			local itemstring = node.name
+			if core.is_colored_paramtype(def.paramtype2) then
+				itemstring = core.itemstring_with_palette(itemstring, node.param2)
+			end
+			-- FIXME: solution needed for paramtype2 == "leveled"
 			-- Calculate size of falling node
-			local s = vector.zero()
-			s.x = (def.visual_scale or 1) * 0.667
+			local s = {}
+			s.x = (def.visual_scale or 1) * SCALE
 			s.y = s.x
 			s.z = s.x
 			-- Compensate for wield_scale
@ -96,31 +127,10 @@ core.register_entity(":__builtin:falling_node", {
 			end
 			self.object:set_properties({
 				is_visible = true,
-				visual = "item",
-				wield_item = node.name,
+				wield_item = itemstring,
 				visual_size = s,
 				glow = def.light_source,
 			})
-			-- Rotate as needed
-			if def.paramtype2 == "facedir" then
-				local fdir = node.param2 % 32 % 24
-				local euler = facedir_to_euler[fdir + 1]
-				if euler then
-					self.object:set_rotation(euler)
-				end
-			elseif def.paramtype2 == "4dir" then
-				local fdir = node.param2 % 4
-				local euler = facedir_to_euler[fdir + 1]
-				if euler then
-					self.object:set_rotation(euler)
-				end
-			end
-		elseif def.drawtype ~= "airlike" then
-			self.object:set_properties({
-				is_visible = true,
-				node = node,
-				glow = def.light_source,
-			})
 		end

 		-- Set collision box (certain nodeboxes only for now)
@ -140,6 +150,111 @@ core.register_entity(":__builtin:falling_node", {
 				})
 			end
 		end
+
+		-- Rotate entity
+		if def.drawtype == "torchlike" then
+			if (def.paramtype2 == "wallmounted" or def.paramtype2 == "colorwallmounted")
+					and node.param2 % 8 == 7 then
+				self.object:set_yaw(-math.pi*0.25)
+			else
+				self.object:set_yaw(math.pi*0.25)
+			end
+		elseif ((node.param2 ~= 0 or def.drawtype == "nodebox" or def.drawtype == "mesh")
+				and (def.wield_image == "" or def.wield_image == nil))
+				or def.drawtype == "signlike"
+				or def.drawtype == "mesh"
+				or def.drawtype == "normal"
+				or def.drawtype == "nodebox" then
+			if (def.paramtype2 == "facedir" or def.paramtype2 == "colorfacedir") then
+				local fdir = node.param2 % 32 % 24
+				-- Get rotation from a precalculated lookup table
+				local euler = facedir_to_euler[fdir + 1]
+				if euler then
+					self.object:set_rotation(euler)
+				end
+			elseif (def.paramtype2 == "4dir" or def.paramtype2 == "color4dir") then
+				local fdir = node.param2 % 4
+				-- Get rotation from a precalculated lookup table
+				local euler = facedir_to_euler[fdir + 1]
+				if euler then
+					self.object:set_rotation(euler)
+				end
+			elseif (def.drawtype ~= "plantlike" and def.drawtype ~= "plantlike_rooted" and
+					(def.paramtype2 == "wallmounted" or def.paramtype2 == "colorwallmounted" or def.drawtype == "signlike")) then
+				local rot = node.param2 % 8
+				if (def.drawtype == "signlike" and def.paramtype2 ~= "wallmounted" and def.paramtype2 ~= "colorwallmounted") then
+					-- Change rotation to "floor" by default for non-wallmounted paramtype2
+					rot = 1
+				end
+				local pitch, yaw, roll = 0, 0, 0
+				if def.drawtype == "nodebox" or def.drawtype == "mesh" then
+					if rot == 0 then
+						pitch, yaw = math.pi/2, 0
+					elseif rot == 1 then
+						pitch, yaw = -math.pi/2, math.pi
+					elseif rot == 2 then
+						pitch, yaw = 0, math.pi/2
+					elseif rot == 3 then
+						pitch, yaw = 0, -math.pi/2
+					elseif rot == 4 then
+						pitch, yaw = 0, math.pi
+					elseif rot == 6 then
+						pitch, yaw = math.pi/2, 0
+					elseif rot == 7 then
+						pitch, yaw = -math.pi/2, math.pi
+					end
+				else
+					if rot == 1 then
+						pitch, yaw = math.pi, math.pi
+					elseif rot == 2 then
+						pitch, yaw = math.pi/2, math.pi/2
+					elseif rot == 3 then
+						pitch, yaw = math.pi/2, -math.pi/2
+					elseif rot == 4 then
+						pitch, yaw = math.pi/2, math.pi
+					elseif rot == 5 then
+						pitch, yaw = math.pi/2, 0
+					elseif rot == 6 then
+						pitch, yaw = math.pi, -math.pi/2
+					elseif rot == 7 then
+						pitch, yaw = 0, -math.pi/2
+					end
+				end
+				if def.drawtype == "signlike" then
+					pitch = pitch - math.pi/2
+					if rot == 0 then
+						yaw = yaw + math.pi/2
+					elseif rot == 1 then
+						yaw = yaw - math.pi/2
+					elseif rot == 6 then
+						yaw = yaw - math.pi/2
+						pitch = pitch + math.pi
+					elseif rot == 7 then
+						yaw = yaw + math.pi/2
+						pitch = pitch + math.pi
+					end
+				elseif def.drawtype == "mesh" or def.drawtype == "normal" or def.drawtype == "nodebox" then
+					if rot == 0 or rot == 1 then
+						roll = roll + math.pi
+					elseif rot == 6 or rot == 7 then
+						if def.drawtype ~= "normal" then
+							roll = roll - math.pi/2
+						end
+					else
+						yaw = yaw + math.pi
+					end
+				end
+				self.object:set_rotation({x=pitch, y=yaw, z=roll})
+			elseif (def.drawtype == "mesh" and def.paramtype2 == "degrotate") then
+				local p2 = (node.param2 - (def.place_param2 or 0)) % 240
+				local yaw = (p2 / 240) * (math.pi * 2)
+				self.object:set_yaw(yaw)
+			elseif (def.drawtype == "mesh" and def.paramtype2 == "colordegrotate") then
+				local p2 = (node.param2 % 32 - (def.place_param2 or 0) % 32) % 24
+				local yaw = (p2 / 24) * (math.pi * 2)
+				self.object:set_yaw(yaw)
+			end
+		end
 	end,

 	get_staticdata = function(self)
@ -195,26 +310,23 @@ core.register_entity(":__builtin:falling_node", {

 			core.remove_node(bcp)
 		else
-			-- We are placing on top so check what's there
 			np.y = np.y + 1
+		end

-			local n2 = core.get_node(np)
-			local nd = core.registered_nodes[n2.name]
-			if not nd or nd.buildable_to then
-				core.remove_node(np)
-			else
-				-- 'walkable' is used to mean "falling nodes can't replace this"
-				-- here. Normally we would collide with the walkable node itself
-				-- and place our node on top (so `n2.name == "air"`), but we
-				-- re-check this in case we ended up inside a node.
-				if not nd.diggable or nd.walkable then
-					return false
-				end
+		-- Check what's here
+		local n2 = core.get_node(np)
+		local nd = core.registered_nodes[n2.name]
+		-- If it's not air or liquid, remove node and replace it with
+		-- it's drops
+		if n2.name ~= "air" and (not nd or nd.liquidtype ~= "source") then
+			if nd and nd.buildable_to == false then
 				nd.on_dig(np, n2, nil)
 				-- If it's still there, it might be protected
 				if core.get_node(np).name == n2.name then
 					return false
 				end
+			else
+				core.remove_node(np)
 			end
 		end

--- a/builtin/game/features.lua
+++ b/builtin/game/features.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/features.lua
+
 core.features = {
 	glasslike_framed = true,
 	nodebox_as_selectionbox = true,
@ -40,12 +42,6 @@ core.features = {
 	node_interaction_actor = true,
 	moveresult_new_pos = true,
 	override_item_remove_fields = true,
-	hotbar_hud_element = true,
-	bulk_lbms = true,
-	abm_without_neighbors = true,
-	biome_weights = true,
-	particle_blend_clip = true,
-	remove_item_match_meta = true,
 }

 function core.has_feature(arg)
--- a/builtin/game/hud.lua
+++ b/builtin/game/hud.lua
@ -251,31 +251,11 @@ register_builtin_hud_element("minimap", {
 		position = {x = 1, y = 0},
 		alignment = {x = -1, y = 1},
 		offset = {x = -10, y = 10},
-		size = {x = 0, y = -25},
+		size = {x = 256, y = 256},
 	},
 	show_elem = function(player, flags)
-		local proto_ver = core.get_player_information(player:get_player_name()).protocol_version
 		-- Don't add a minimap for clients which already have it hardcoded in C++.
-		return flags.minimap and proto_ver >= 44
-	end,
-	update_def = function(player, elem_def)
-		local proto_ver = core.get_player_information(player:get_player_name()).protocol_version
-		-- Only use percentage when the client supports it.
-		elem_def.size = proto_ver >= 45 and {x = 0, y = -25} or {x = 256, y = 256}
-	end,
-})
-
--- Hotbar
-
-register_builtin_hud_element("hotbar", {
-	elem_def = {
-		type = "hotbar",
-		position = {x = 0.5, y = 1},
-		direction = 0,
-		alignment = {x = 0, y = -1},
-		offset = {x = 0, y = -4}, -- Extra padding below.
-	},
-	show_elem = function(player, flags)
-		return flags.hotbar
+		return flags.minimap and
+				core.get_player_information(player:get_player_name()).protocol_version >= 44
 	end,
 })
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@ -38,7 +38,6 @@ dofile(gamepath .. "forceloading.lua")
 dofile(gamepath .. "hud.lua")
 dofile(gamepath .. "knockback.lua")
 dofile(gamepath .. "async.lua")
-dofile(gamepath .. "death_screen.lua")

 core.after(0, builtin_shared.cache_content_ids)

--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/item.lua
+
 local builtin_shared = ...

 local function copy_pointed_thing(pointed_thing)
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/item_entity.lua
+
 function core.spawn_item(pos, item)
 	-- Take item in any format
 	local stack = ItemStack(item)
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@ -1,17 +1,19 @@
+-- Minetest: builtin/misc.lua
+
 local S = core.get_translator("__builtin")

 --
 -- Misc. API functions
 --

-- @spec core.kick_player(String, String, Boolean) :: Boolean
-function core.kick_player(player_name, reason, reconnect)
+-- @spec core.kick_player(String, String) :: Boolean
+function core.kick_player(player_name, reason)
 	if type(reason) == "string" then
 		reason = "Kicked: " .. reason
 	else
 		reason = "Kicked."
 	end
-	return core.disconnect_player(player_name, reason, reconnect)
+	return core.disconnect_player(player_name, reason)
 end

 function core.check_player_privs(name, ...)
@ -296,28 +298,3 @@ do
 		return valid_object_iterator(core.get_objects_in_area(min_pos, max_pos))
 	end
 end
-
--
-- Helper for LBM execution, called from C++
--
-
-function core.run_lbm(id, pos_list, dtime_s)
-	local lbm = core.registered_lbms[id]
-	assert(lbm, "Entry with given id not found in registered_lbms table")
-	core.set_last_run_mod(lbm.mod_origin)
-	if lbm.bulk_action then
-		return lbm.bulk_action(pos_list, dtime_s)
-	end
-	-- emulate non-bulk LBMs
-	local expect = core.get_node(pos_list[1]).name
-	-- engine guarantees that
-	-- 1) all nodes are the same content type
-	-- 2) the list is up-to-date when we're called
-	assert(expect ~= "ignore")
-	for _, pos in ipairs(pos_list) do
-		local n = core.get_node(pos)
-		if n.name == expect then -- might have been changed by previous call
-			lbm.action(pos, n, dtime_s)
-		end
-	end
-end
--- a/builtin/game/misc_s.lua
+++ b/builtin/game/misc_s.lua
@ -1,3 +1,4 @@
+-- Minetest: builtin/misc_s.lua
 -- The distinction of what goes here is a bit tricky, basically it's everything
 -- that does not (directly or indirectly) need access to ServerEnvironment,
 -- Server or writable access to IGameDef on the engine side.
@ -24,8 +25,11 @@ end


 function core.get_item_group(name, group)
-	local def = core.registered_items[name]
-	return def and def.groups[group] or 0
+	if not core.registered_items[name] or not
+			core.registered_items[name].groups[group] then
+		return 0
+	end
+	return core.registered_items[name].groups[group]
 end


@ -36,7 +40,11 @@ end


 function core.setting_get_pos(name)
-	return core.settings:get_pos(name)
+	local value = core.settings:get(name)
+	if not value then
+		return nil
+	end
+	return core.string_to_pos(value)
 end


@ -112,25 +120,3 @@ if core.set_push_moveresult1 then
 	end)
 	core.set_push_moveresult1 = nil
 end
-
-- Protocol version table
-- see also src/network/networkprotocol.cpp
-core.protocol_versions = {
-	["5.0.0"] = 37,
-	["5.1.0"] = 38,
-	["5.2.0"] = 39,
-	["5.3.0"] = 39,
-	["5.4.0"] = 39,
-	["5.5.0"] = 40,
-	["5.6.0"] = 41,
-	["5.7.0"] = 42,
-	["5.8.0"] = 43,
-	["5.9.0"] = 44,
-	["5.9.1"] = 45,
-	["5.10.0"] = 46,
-	["5.11.0"] = 47,
-}
-
-setmetatable(core.protocol_versions, {__newindex = function()
-	error("core.protocol_versions is read-only")
-end})
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/privileges.lua
+
 local S = core.get_translator("__builtin")

 --
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@ -1,3 +1,5 @@
+-- Minetest: builtin/register.lua
+
 local builtin_shared = ...
 local S = core.get_translator("__builtin")

@ -103,12 +105,7 @@ function core.register_lbm(spec)
 	-- Add to core.registered_lbms
 	check_modname_prefix(spec.name)
 	check_node_list(spec.nodenames, "nodenames")
-	local have = spec.action ~= nil
-	local have_bulk = spec.bulk_action ~= nil
-	assert(not have or type(spec.action) == "function", "Field 'action' must be a function")
-	assert(not have_bulk or type(spec.bulk_action) == "function", "Field 'bulk_action' must be a function")
-	assert(have ~= have_bulk, "Either 'action' or 'bulk_action' must be present")
-
+	assert(type(spec.action) == "function", "Required field 'action' of type function")
 	core.registered_lbms[#core.registered_lbms + 1] = spec
 	spec.mod_origin = core.get_current_modname() or "??"
 end
--- a/builtin/game/static_spawn.lua
+++ b/builtin/game/static_spawn.lua
@ -1,7 +1,9 @@
+-- Minetest: builtin/static_spawn.lua
+
 local static_spawnpoint_string = core.settings:get("static_spawnpoint")
 if static_spawnpoint_string and
 		static_spawnpoint_string ~= "" and
-		not core.settings:get_pos("static_spawnpoint") then
+		not core.setting_get_pos("static_spawnpoint") then
 	error('The static_spawnpoint setting is invalid: "' ..
 			static_spawnpoint_string .. '"')
 end
--- a/builtin/game/tests/test_moveaction.lua
+++ b/builtin/game/tests/test_moveaction.lua
@ -35,7 +35,7 @@ end
 local log = function(...) end
 --local log = print

-core.register_allow_player_inventory_action(function(_, action, inv, info)
+minetest.register_allow_player_inventory_action(function(_, action, inv, info)
 	log("\tallow " .. action, info.count or info.stack:to_string())

 	if action == "move" then
@ -69,7 +69,7 @@ core.register_allow_player_inventory_action(function(_, action, inv, info)
 	return -- Unlimited
 end)

-core.register_on_player_inventory_action(function(_, action, inv, info)
+minetest.register_on_player_inventory_action(function(_, action, inv, info)
 	log("\ton " .. action, info.count or info.stack:to_string())

 	if action == "take" or action == "put" then
--- a/Show more
+++ b/Show more